diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:40:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:40:03 +0100 |
| commit | 0af07495ecccaeff605e64444fa6d56d56a71358 (patch) | |
| tree | 2cc71da797b3a1248d74f59d01d5a7b64b2546ea /libavcodec/h264dsp.c | |
| parent | e5670cb8a1c9467a4a31dcb10f31bf63e44aeb69 (diff) | |
| parent | 6a4430407404bfe55581e66a86a496c9adf6fb44 (diff) | |
| download | ffmpeg-streaming-0af07495ecccaeff605e64444fa6d56d56a71358.zip ffmpeg-streaming-0af07495ecccaeff605e64444fa6d56d56a71358.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h264dsp.c')
| -rw-r--r-- | libavcodec/h264dsp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index 69d0536..83de168 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -29,6 +29,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" #include "h264dsp.h" +#include "h264idct.h" #include "libavutil/common.h" #define BIT_DEPTH 8 |
