diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 14:37:08 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-02-15 16:18:21 +0100 |
| commit | 737eb5976f6a37703923ce3c3d5e6ca8eeabb43a (patch) | |
| tree | ab13f1d9bc6e2d47882bb54c50f26f16ecdcf28b /libavdevice | |
| parent | 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2 (diff) | |
| download | ffmpeg-streaming-737eb5976f6a37703923ce3c3d5e6ca8eeabb43a.zip ffmpeg-streaming-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 'libavdevice')
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/v4l.c | 2 | ||||
| -rw-r--r-- | libavdevice/v4l2.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 1c0630b..be28f4a 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -1,7 +1,7 @@ include $(SUBDIR)../config.mak NAME = avdevice -FFLIBS = avformat avcodec avcore avutil +FFLIBS = avformat avcodec avutil HEADERS = avdevice.h diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index c107684..9a155f9 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -22,7 +22,7 @@ #undef __STRICT_ANSI__ //workaround due to broken kernel headers #include "config.h" #include "libavutil/rational.h" -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "libavformat/avformat.h" #include "libavcodec/dsputil.h" #include <unistd.h> diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 993e2ad..1f1a4bc 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -43,7 +43,7 @@ #endif #include <time.h> #include <strings.h> -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" static const int desired_video_buffers = 256; |
