[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

Michael Niedermayer git at videolan.org
Sat Jun 1 23:58:45 CEST 2013

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  1 23:46:56 2013 +0200| [c28aafe6c048a9dca3a483124d8be963f9f41ae2] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: detect when the created overlay buffers are not valid for the wanted overlay height
  ffplay: do not allow wider window than 16383
  ffplay: use 0 frame delay if redisplaying an already displayed frame
  ffplay: use more sane frame timer resetting logic
  ffplay: only update pts if not redisplaying a frame
  ffplay: fix compute_target_delay to better handle frames with long durations
  ffplay: if playing only audio or video only, show the master clock diff in status line
  ffplay: factorize clock functions
  ffplay: decrease video picture queue size to 3

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c28aafe6c048a9dca3a483124d8be963f9f41ae2

More information about the ffmpeg-cvslog mailing list