diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 21:48:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 22:57:54 +0200 |
| commit | 1e7008675b2d930955b0295808ef208d92e5639d (patch) | |
| tree | 7613e4d48a8d265373b678fe709ec81ab3d1d308 /libavcodec/avcodec.h | |
| parent | 30e9ebb14f197bbc3fcbde467da39d1a79ac8d52 (diff) | |
| parent | 8655c54160767de1a6b96f8bc310d6e4eaceff48 (diff) | |
| download | ffmpeg-1e7008675b2d930955b0295808ef208d92e5639d.tar.gz | |
Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'
* commit '8655c54160767de1a6b96f8bc310d6e4eaceff48':
libvpx: Support the vp9 extended profiles
Conflicts:
Changelog
configure
libavcodec/libvpx.c
libavcodec/libvpx.h
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/version.h
mostly not merged, as requested by jamrial
See: 01e59d48ed1a41b88107ed1d4d56ae0cbcd1a60e
See: 079b7f6eacc09bc2813fc1ddc230ab05022b69c2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b75b27e66f..25cb34f2a7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2924,17 +2924,16 @@ typedef struct AVCodecContext { #define FF_PROFILE_JPEG2000_DCINEMA_2K 3 #define FF_PROFILE_JPEG2000_DCINEMA_4K 4 +#define FF_PROFILE_VP9_0 0 +#define FF_PROFILE_VP9_1 1 +#define FF_PROFILE_VP9_2 2 +#define FF_PROFILE_VP9_3 3 #define FF_PROFILE_HEVC_MAIN 1 #define FF_PROFILE_HEVC_MAIN_10 2 #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define FF_PROFILE_HEVC_REXT 4 -#define FF_PROFILE_VP9_0 0 -#define FF_PROFILE_VP9_1 1 -#define FF_PROFILE_VP9_2 2 -#define FF_PROFILE_VP9_3 3 - /** * level * - encoding: Set by user. |