7fb993d338
* commit '7fb993d338': qpeldsp: Mark source pointer in qpel_mc_func function pointer const Conflicts: libavcodec/h264qpel_template.c libavcodec/x86/cavsdsp.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
81b9bf3192
1a583c0c60
8b0dd4942a
2d60444331
c166148409
f46bb608d9