[FFmpeg-cvslog] Merge commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3' into release/2.4
Michael Niedermayer
git at videolan.org
Mon Dec 15 13:54:54 CET 2014
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 15 13:43:45 2014 +0100| [5ceae49caf088040c9bac45b5758390baea41c34] | committer: Michael Niedermayer
Merge commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3' into release/2.4
* commit '864c0c50eb0e7a112b20007459b0cb94b61cb8d3':
avconv: Use the mpeg12 private option scan_offset
Conflicts:
ffmpeg_opt.c
See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ceae49caf088040c9bac45b5758390baea41c34
---
More information about the ffmpeg-cvslog
mailing list