summaryrefslogtreecommitdiff
path: root/libavcodec/dpx.c
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-02-07 14:37:08 +0100
committerReinhard Tartler <siretart@tauware.de>2011-02-15 16:18:21 +0100
commit737eb5976f6a37703923ce3c3d5e6ca8eeabb43a (patch)
treeab13f1d9bc6e2d47882bb54c50f26f16ecdcf28b /libavcodec/dpx.c
parent8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2 (diff)
downloadffmpeg-737eb5976f6a37703923ce3c3d5e6ca8eeabb43a.tar.gz
Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec/dpx.c')
-rw-r--r--libavcodec/dpx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 55ae4e7248..ade4e8cbc0 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -20,7 +20,7 @@
*/
#include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "bytestream.h"
#include "avcodec.h"