From d03a94e2b752216b1b66eff33e411a8d69f220e9 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 23 Feb 2013 08:20:12 +0100 Subject: lavc: remove disabled FF_API_SUB_ID cruft --- libavcodec/options_table.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'libavcodec/options_table.h') diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 7c81d5e7f1..6090a81913 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -71,9 +71,6 @@ static const AVOption options[]={ {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, {"ignorecrop", "ignore cropping information from sps", 1, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"}, {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, -#if FF_API_SUB_ID -{"sub_id", NULL, OFFSET(sub_id), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"}, {"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" }, {"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" }, -- cgit v1.2.3