[FFmpeg-cvslog] Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1
Michael Niedermayer
git at videolan.org
Fri Jun 20 01:21:47 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 01:11:54 2014 +0200| [62899d79a380aadd95793beb096e74eb9c8b8776] | committer: Michael Niedermayer
Merge commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc' into release/1.1
* commit 'ba8ab4e7ae016cf970b0f335a7933f2db53784bc':
avconv: do not send non-monotonous DTS to the muxers.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62899d79a380aadd95793beb096e74eb9c8b8776
---
More information about the ffmpeg-cvslog
mailing list