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 /libavformat/matroskaenc.c | |
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 'libavformat/matroskaenc.c')
-rw-r--r-- | libavformat/matroskaenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a288c7f85f..1d0dc38ca8 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" |