From 737eb5976f6a37703923ce3c3d5e6ca8eeabb43a Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 7 Feb 2011 14:37:08 +0100 Subject: 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 --- libavcodec/bmpenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/bmpenc.c') diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index d424662..b8f9047 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcore/internal.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "bmp.h" -- cgit v1.1