diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 14:37:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-16 23:00:30 +0100 |
| commit | 7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch) | |
| tree | 4510accdfd282fafb4f8caae1055c76ebf45e4c0 /libavdevice | |
| parent | fad8143f5b9689e0e2dafe46500d944cfa58a911 (diff) | |
| download | ffmpeg-7ffe76e540297ad4df2896064f83cb1adbd81fd9.tar.gz | |
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
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 1c0630b38c..be28f4a0ad 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 c107684bff..9a155f9df6 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 993e2adcec..1f1a4bcfb8 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; |