Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 16:48:42 +0000 (18:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 16:54:15 +0000 (18:54 +0200)
commit5440151fa42d4e18c83bc42ff31526680697e645
tree43851c2293c5cc89326ef227674a0f059290e904
parenta1ac12bddd8ddb184281eadf5431dce29c02f27a
parent3dc6272bed7890a49080e18eacf3c7a4a6594b0d
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'

* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
  Remove a number of unnecessary dsputil.h #includes

Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
libavcodec/arm/vp3dsp_init_arm.c
libavcodec/binkdsp.c
libavcodec/dvbsubdec.c
libavcodec/dvdsubdec.c
libavcodec/h264pred.c
libavcodec/indeo5.c
libavcodec/mpeg12.c
libavcodec/msmpeg4dec.c
libavcodec/mss4.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
libavcodec/vp3dsp.c
libavcodec/vp56.h
libavcodec/x86/vp3dsp_init.c