Michael Niedermayer 2904d052b7 Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac' ...

* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
  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>

2014-07-25 13:05:08 +02:00

7.1 KiB

Raw Blame History

View Raw