Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 12:40:03 +0000 (13:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Feb 2013 12:40:03 +0000 (13:40 +0100)
commit0af07495ecccaeff605e64444fa6d56d56a71358
tree2cc71da797b3a1248d74f59d01d5a7b64b2546ea
parente5670cb8a1c9467a4a31dcb10f31bf63e44aeb69
parent6a4430407404bfe55581e66a86a496c9adf6fb44
Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'

* commit '6a4430407404bfe55581e66a86a496c9adf6fb44':
  dsputil: Move ff_h264_idct function declarations to a separate header

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.h
libavcodec/h264dsp.c
libavcodec/h264idct.c
libavcodec/h264idct.h