diff options
| author | Kieran Kunhya <kierank@obe.tv> | 2014-08-03 19:24:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 05:36:44 +0200 |
| commit | 2a3c36e920d958e99fb4edf065a6713c30f2c2a9 (patch) | |
| tree | e9a75b83c7cdcd9bc0f24a7bcf3f0183058c8422 /libavutil | |
| parent | 2793b218bdd59db51f1f5c960c508fea7190310e (diff) | |
| download | ffmpeg-streaming-2a3c36e920d958e99fb4edf065a6713c30f2c2a9.zip ffmpeg-streaming-2a3c36e920d958e99fb4edf065a6713c30f2c2a9.tar.gz | |
Deprecate AFD field and add AFD as side-data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 16 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index c57eb55..ca76c6e 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -82,6 +82,22 @@ enum AVFrameSideDataType { * See libavutil/display.h for a detailed description of the data. */ AV_FRAME_DATA_DISPLAYMATRIX, + /** + * Active Format Description data consisting of a single byte as specified in ETSI TS 101 154 + * using AVActiveFormatDescription enum + */ + AV_FRAME_DATA_AFD, +}; + +enum AVActiveFormatDescription +{ + AV_AFD_SAME = 8, + AV_AFD_4_3 = 9, + AV_AFD_16_9 = 10, + AV_AFD_14_9 = 11, + AV_AFD_4_3_SP_14_9 = 13, + AV_AFD_16_9_SP_14_9 = 14, + AV_AFD_SP_4_3 = 15 }; typedef struct AVFrameSideData { diff --git a/libavutil/version.h b/libavutil/version.h index 42e2db5..9af8f5f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 94 +#define LIBAVUTIL_VERSION_MINOR 95 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
