
* commit '93af2734ee609133eaeca28329d7f13241dd411f': lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '93af2734ee609133eaeca28329d7f13241dd411f': lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT. Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>