[FFmpeg-cvslog] Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'
Michael Niedermayer
git at videolan.org
Tue Mar 12 22:26:32 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 22:18:08 2013 +0100| [5beddbc4cf81fc29866981cdf62de76299627ed0] | committer: Michael Niedermayer
Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'
* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
lavc: remove disabled FF_API_INTER_THRESHOLD cruft
lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5beddbc4cf81fc29866981cdf62de76299627ed0
---
More information about the ffmpeg-cvslog
mailing list