summaryrefslogtreecommitdiffstats
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-09 13:44:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-09 13:46:03 +0100
commitffbe19fc84fe270410ee95a0501e5906c685e14d (patch)
tree11879cd28e9fcb728b1f700dfd35701bcb85e8f4 /libavcodec/imgconvert.c
parent0af07495ecccaeff605e64444fa6d56d56a71358 (diff)
parent35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6 (diff)
downloadffmpeg-streaming-ffbe19fc84fe270410ee95a0501e5906c685e14d.zip
ffmpeg-streaming-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/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 09d2489..5c3ec39 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -32,6 +32,7 @@
#include "avcodec.h"
#include "dsputil.h"
+#include "imgconvert.h"
#include "internal.h"
#include "libavutil/avassert.h"
#include "libavutil/colorspace.h"
OpenPOWER on IntegriCloud