[FFmpeg-cvslog] Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
Michael Niedermayer
git at videolan.org
Thu Aug 8 11:46:55 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 8 11:28:23 2013 +0200| [eec9c7af3370ee1a114597686382a4ca029392ca] | committer: Michael Niedermayer
Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
* commit 'fee9db1fdf921295233e94cbe2769f9cd722206d':
libavcodec: use avpriv_open()
Conflicts:
libavcodec/libxvid_rc.c
The changed code does not exist in ffmpeg anymore, thus nothing is
changed.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eec9c7af3370ee1a114597686382a4ca029392ca
---
More information about the ffmpeg-cvslog
mailing list