[FFmpeg-cvslog] Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'
Michael Niedermayer
git at videolan.org
Tue Mar 12 23:25:28 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 23:08:08 2013 +0100| [f7b041b11b0f1dcfe99918230b56859e6960b9f4] | committer: Michael Niedermayer
Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'
* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7b041b11b0f1dcfe99918230b56859e6960b9f4
---
More information about the ffmpeg-cvslog
mailing list