From f42eda74dd800017d4a0cdd1116d7e99253944be Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Mon, 8 Sep 2003 22:12:30 +0000 Subject: [PATCH] header fixes - removed MPEG-4 b frame limtation in help Originally committed as revision 2233 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 56b884a004..74c172efb9 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -20,8 +20,6 @@ #include "common.h" #include "avformat.h" #include "framehook.h" -/* usleep() */ -#include "os_support.h" #ifndef CONFIG_WIN32 #include @@ -38,7 +36,6 @@ #include #endif #include -#include #include "cmdutils.h" @@ -2692,7 +2689,7 @@ const OptionDef options[] = { { "idct_algo", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_idct_algo}, "set idct algo", "algo" }, { "er", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_resilience}, "set error resilience", "n" }, { "ec", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_error_concealment}, "set error concealment", "bit_mask" }, - { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames (only MPEG-4)", "frames" }, + { "bf", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_frames}, "use 'frames' B frames", "frames" }, { "hq", OPT_BOOL, {(void*)&mb_decision}, "activate high quality settings" }, { "mbd", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_decision}, "macroblock decision", "mode" }, { "4mv", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&use_4mv}, "use four motion vector by macroblock (only MPEG-4)" },