[FFmpeg-cvslog] Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
Michael Niedermayer
git at videolan.org
Sat Oct 18 13:51:53 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 13:30:38 2014 +0200| [74128352047ee3fb075b0f69ab16047f70b45a42] | committer: Michael Niedermayer
Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'
* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf':
lavc: make rc_qsquish a private option of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74128352047ee3fb075b0f69ab16047f70b45a42
---
More information about the ffmpeg-cvslog
mailing list