Merge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 12:44:55 +0000 (13:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 12:46:03 +0000 (13:46 +0100)
commitffbe19fc84fe270410ee95a0501e5906c685e14d
tree11879cd28e9fcb728b1f700dfd35701bcb85e8f4
parent0af07495ecccaeff605e64444fa6d56d56a71358
parent35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6
Merge commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6'

* commit '35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6':
  dsputil: Move ff_shrink* function declarations to separate header
  dsputil: Move ff_svq3 function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/imgconvert.h
libavcodec/svq3.c
libavcodec/svq3.h