[FFmpeg-cvslog] Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'
Michael Niedermayer
git at videolan.org
Sun Dec 14 23:06:12 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 14 22:53:23 2014 +0100| [829099545bf32c28236f8caa5558b81d25efcf91] | committer: Michael Niedermayer
Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'
* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
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=829099545bf32c28236f8caa5558b81d25efcf91
---
More information about the ffmpeg-cvslog
mailing list