projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 49f441e f07cb53)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 22:57:00 +0000 (00:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jul 2013 22:57:04 +0000 (00:57 +0200)
* cus/stable:
  ffplay: assume 0 stream start time if start time is unset in duration check
  ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

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

Trivial merge
FFmpeg git repo