[FFmpeg-cvslog] Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'
Michael Niedermayer
git at videolan.org
Sun Oct 12 01:03:55 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 12 00:52:46 2014 +0200| [bec077a1ab1fe19d8cb7a9cafd9731546d449c4b] | committer: Michael Niedermayer
Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'
* commit 'bd239c9a2e151c0aeeb653a571f130aae7320894':
lavf: Don't drop both pts and dts if timestamps are invalid
Conflicts:
libavformat/utils.c
tests/ref/fate/vc1-ism
See: cd6851c5ef281e44af7028e08597c4dfb73d880f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bec077a1ab1fe19d8cb7a9cafd9731546d449c4b
---
More information about the ffmpeg-cvslog
mailing list