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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/aea.c | 2 | ||||
| -rw-r--r-- | libavformat/flic.c | 2 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/wv.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 1d4e75e..f319031 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -1,7 +1,7 @@ include $(SUBDIR)../config.mak NAME = avformat -FFLIBS = avcodec avcore avutil +FFLIBS = avcodec avutil HEADERS = avformat.h avio.h version.h diff --git a/libavformat/aea.c b/libavformat/aea.c index 8a508ec..16a11c8 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -23,7 +23,7 @@ #include "avformat.h" #include "pcm.h" #include "libavutil/intreadwrite.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #define AT1_SU_SIZE 212 diff --git a/libavformat/flic.c b/libavformat/flic.c index 2e03c3b..5942f72 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -32,8 +32,8 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/audioconvert.h" #include "avformat.h" -#include "libavcore/audioconvert.h" #define FLIC_FILE_MAGIC_1 0xAF11 #define FLIC_FILE_MAGIC_2 0xAF12 diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a288c7f..1d0dc38 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -26,7 +26,7 @@ #include "avc.h" #include "flacenc.h" #include "avlanguage.h" -#include "libavcore/samplefmt.h" +#include "libavutil/samplefmt.h" #include "libavutil/intreadwrite.h" #include "libavutil/random_seed.h" #include "libavutil/lfg.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index 2303244..225b9f2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3341,7 +3341,7 @@ void dump_format(AVFormatContext *ic, } #if FF_API_PARSE_FRAME_PARAM -#include "libavcore/parseutils.h" +#include "libavutil/parseutils.h" int parse_image_size(int *width_ptr, int *height_ptr, const char *str) { diff --git a/libavformat/wv.c b/libavformat/wv.c index 182f900..c9a1f0e 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/audioconvert.h" #include "libavutil/intreadwrite.h" #include "avformat.h" #include "apetag.h" #include "id3v1.h" -#include "libavcore/audioconvert.h" // specs say that maximum block size is 1Mb #define WV_BLOCK_LIMIT 1047576 |
