diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:44:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:46:03 +0100 |
| commit | ffbe19fc84fe270410ee95a0501e5906c685e14d (patch) | |
| tree | 11879cd28e9fcb728b1f700dfd35701bcb85e8f4 /libavcodec/h264.c | |
| parent | 0af07495ecccaeff605e64444fa6d56d56a71358 (diff) | |
| parent | 35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6 (diff) | |
| download | ffmpeg-ffbe19fc84fe270410ee95a0501e5906c685e14d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 22e37c3ba9..28d63d914d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -42,6 +42,7 @@ #include "golomb.h" #include "mathops.h" #include "rectangle.h" +#include "svq3.h" #include "thread.h" #include "vdpau_internal.h" #include "libavutil/avassert.h" |