]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb4e434 f1a75aa)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Jun 2012 15:06:02 +0000 (17:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Jun 2012 15:06:09 +0000 (17:06 +0200)
commit1bf22c3a8faf478255712ea95070d948d7614b8d
treec8ba538b63baa8a841f7607ab030aefa3dda3a82tree | snapshot
parentfb4e434cfb5bf5510bf9ade40a9b63e3a579247ecommit | diff
parentf1a75aa033db9e8beceb0b44d797decfc41fd469commit | diff
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: remove VideoPicture pix_fmt and use frame pixel format instead
  ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8
  ffplay: add pause audio feature in the middle of a packet
  ffplay: remove VideoPicture duration field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Unnamed repository; edit this file 'description' to name the repository.