]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d68f5e 1c2ac44)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Mar 2013 21:24:55 +0000 (22:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Mar 2013 21:25:00 +0000 (22:25 +0100)
* cus/stable:
  ffplay: always queue attachment pictures after flushing the video packet queue
  ffplay: fix early frame dropped pts serial

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.