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 /libavcodec/nellymoserdec.c | |
| parent | 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2 (diff) | |
| download | ffmpeg-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/nellymoserdec.c')
| -rw-r--r-- | libavcodec/nellymoserdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 80e04ee0a2..fd8568d5ab 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -34,7 +34,7 @@ #include "nellymoser.h" #include "libavutil/lfg.h" #include "libavutil/random_seed.h" -#include "libavcore/audioconvert.h" +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "dsputil.h" #include "fft.h" |