Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jul 2014 10:58:03 +0000 (12:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jul 2014 11:05:08 +0000 (13:05 +0200)
commit2904d052b7ca8714fda5c039c958bc0a0ae40877
tree7124a278835635a85ce1f180aa1cdd66eb9c0c6d
parent937eaba2a1159225aeef694d9b2e72d9eff0c8da
parent7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac
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>
15 files changed:
libavcodec/arm/h264qpel_init_arm.c
libavcodec/arm/rv40dsp_init_arm.c
libavcodec/cavsdsp.c
libavcodec/h264qpel_template.c
libavcodec/ppc/h264qpel.c
libavcodec/ppc/h264qpel_template.c
libavcodec/qpeldsp.c
libavcodec/qpeldsp.h
libavcodec/rv30dsp.c
libavcodec/rv40dsp.c
libavcodec/wmv2dsp.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/qpeldsp_init.c
libavcodec/x86/rv40dsp_init.c