[FFmpeg-cvslog] Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  9 13:40:03 2013 +0100| [0af07495ecccaeff605e64444fa6d56d56a71358] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0af07495ecccaeff605e64444fa6d56d56a71358
---