* commit '6a4430407404bfe55581e66a86a496c9adf6fb44': dsputil: Move ff_h264_idct function declarations to a separate header Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>