diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-29 02:13:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-11 14:55:28 +0100 |
| commit | cba199b5952feca4df39560d5c42cb7992e5d875 (patch) | |
| tree | fbd7127efdac3a4adf8f7dbc70d7ddfe94442ffd | |
| parent | bcfd9f8d7fc16ae58ead975acfd2f0b748388111 (diff) | |
| download | ffmpeg-cba199b5952feca4df39560d5c42cb7992e5d875.tar.gz | |
avcodec/options_table: add entries for MPEG4 video profiles
Fixes part of Ticket2901
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/codecs.texi | 8 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/codecs.texi b/doc/codecs.texi index 4105e09998..47a37f8fa3 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -863,6 +863,14 @@ Possible values: @item mpeg2_aac_he +@item mpeg4_sp + +@item mpeg4_core + +@item mpeg4_main + +@item mpeg4_asp + @item dts @item dts_es diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 1d5b07884a..6d6efb9044 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -361,6 +361,10 @@ static const AVOption avcodec_options[] = { {"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "profile"}, {"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_HRA }, INT_MIN, INT_MAX, A|E, "profile"}, {"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_MA }, INT_MIN, INT_MAX, A|E, "profile"}, +{"mpeg4_sp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, +{"mpeg4_core", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_CORE }, INT_MIN, INT_MAX, V|E, "profile"}, +{"mpeg4_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_MAIN }, INT_MIN, INT_MAX, V|E, "profile"}, +{"mpeg4_asp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_ADVANCED_SIMPLE }, INT_MIN, INT_MAX, V|E, "profile"}, {"level", NULL, OFFSET(level), AV_OPT_TYPE_INT, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_LEVEL_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "level"}, {"lowres", "decode at 1= 1/2, 2=1/4, 3=1/8 resolutions", OFFSET(lowres), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, V|A|D}, |