[FFmpeg-cvslog] Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'
Michael Niedermayer
git at videolan.org
Fri Nov 7 23:44:59 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 7 23:19:28 2014 +0100| [0d71e825dbb36a61c47a9f7847fa240700791430] | committer: Michael Niedermayer
Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'
* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
lavf: Print a warning if failed to avoid negative timestamps when requested
Conflicts:
libavformat/mux.c
See: ec6a5fc6cca22e4eb0a91cc8fba786d41ade2032
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d71e825dbb36a61c47a9f7847fa240700791430
---
More information about the ffmpeg-cvslog
mailing list