aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.c
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-02-07 14:37:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-16 23:00:30 +0100
commit7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch)
tree4510accdfd282fafb4f8caae1055c76ebf45e4c0 /cmdutils.c
parentfad8143f5b9689e0e2dafe46500d944cfa58a911 (diff)
downloadffmpeg-7ffe76e540297ad4df2896064f83cb1adbd81fd9.tar.gz
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Diffstat (limited to 'cmdutils.c')
-rw-r--r--cmdutils.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 0679f011b2..b71272d255 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -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);