Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer 0af07495ec 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>
2013-02-09 13:40:03 +01:00
Diego Biurrun 6a44304074 dsputil: Move ff_h264_idct function declarations to a separate header 2013-02-07 22:08:19 +01:00