diff options
| author | Marton Balint <cus@passwd.hu> | 2020-05-10 21:58:35 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-05-22 22:23:18 +0200 |
| commit | 82f9eb6f6c7165a404426bee8a61aac76508a177 (patch) | |
| tree | 088608889ce419110fbb18dd0f97fb0074720ea5 /libavcodec/profiles.h | |
| parent | ebb770d3abb92feba9b1d015b661cb8afb92fcaa (diff) | |
| download | ffmpeg-82f9eb6f6c7165a404426bee8a61aac76508a177.tar.gz | |
avcodec: move mpeg4 profiles to profiles.h
Also bump micro version after the recent option changes.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec/profiles.h')
| -rw-r--r-- | libavcodec/profiles.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index d950971875..e414ea77a7 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -37,6 +37,12 @@ FF_AVCTX_PROFILE_OPTION("mpeg2_aac_low", NULL, AUDIO, FF_PROFILE_MPEG2_AAC_LOW)\ FF_AVCTX_PROFILE_OPTION("mpeg2_aac_he", NULL, AUDIO, FF_PROFILE_MPEG2_AAC_HE)\ +#define FF_MPEG4_PROFILE_OPTS \ + FF_AVCTX_PROFILE_OPTION("mpeg4_sp", NULL, VIDEO, FF_PROFILE_MPEG4_SIMPLE)\ + FF_AVCTX_PROFILE_OPTION("mpeg4_core", NULL, VIDEO, FF_PROFILE_MPEG4_CORE)\ + FF_AVCTX_PROFILE_OPTION("mpeg4_main", NULL, VIDEO, FF_PROFILE_MPEG4_MAIN)\ + FF_AVCTX_PROFILE_OPTION("mpeg4_asp", NULL, VIDEO, FF_PROFILE_MPEG4_ADVANCED_SIMPLE)\ + extern const AVProfile ff_aac_profiles[]; extern const AVProfile ff_dca_profiles[]; extern const AVProfile ff_dnxhd_profiles[]; |