Merge libavcore into libavutil

Done to keep ABI compatible. Otherwise this is just silly
This commit is contained in:
Reinhard Tartler
2011-02-07 14:37:08 +01:00
committed by Michael Niedermayer
parent fad8143f5b
commit 7ffe76e540
121 changed files with 167 additions and 320 deletions

View File

@@ -38,7 +38,6 @@
#include "libavutil/pixdesc.h"
#include "libavutil/eval.h"
#include "libavcodec/opt.h"
#include "libavcore/avcore.h"
#include "cmdutils.h"
#include "version.h"
#if CONFIG_NETWORK
@@ -413,7 +412,6 @@ static int warned_cfg = 0;
static void print_all_libs_info(FILE* outstream, int flags)
{
PRINT_LIB_INFO(outstream, avutil, AVUTIL, flags);
PRINT_LIB_INFO(outstream, avcore, AVCORE, flags);
PRINT_LIB_INFO(outstream, avcodec, AVCODEC, flags);
PRINT_LIB_INFO(outstream, avformat, AVFORMAT, flags);
PRINT_LIB_INFO(outstream, avdevice, AVDEVICE, flags);