[FFmpeg-cvslog] Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
Michael Niedermayer
git at videolan.org
Mon Sep 23 14:23:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 14:13:43 2013 +0200| [ef7e8efc6befaf02b0953dbbbeb2fc0648b7bb58] | committer: Michael Niedermayer
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
lavf: Avoid setting avg_frame_rate if delta_dts is negative
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef7e8efc6befaf02b0953dbbbeb2fc0648b7bb58
---
More information about the ffmpeg-cvslog
mailing list