[FFmpeg-cvslog] avcodec/options_table: add entries for MPEG4 video profiles

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 29 02:13:28 2014 +0100| [cba199b5952feca4df39560d5c42cb7992e5d875] | committer: Michael Niedermayer

avcodec/options_table: add entries for MPEG4 video profiles

Fixes part of Ticket2901

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cba199b5952feca4df39560d5c42cb7992e5d875
---

 doc/codecs.texi            |    8 ++++++++
 libavcodec/options_table.h |    4 ++++
 2 files changed, 12 insertions(+)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 4105e09..47a37f8 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -863,6 +863,14 @@ Possible values:
 
 @item mpeg2_aac_he
 
+ at item mpeg4_sp
+
+ at item mpeg4_core
+
+ at item mpeg4_main
+
+ at item mpeg4_asp
+
 @item dts
 
 @item dts_es
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 1d5b078..6d6efb9 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},