diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 05:44:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 06:11:34 +0200 |
| commit | 71d008ebe4f96974433eecfd3575bc82eb4b06a8 (patch) | |
| tree | 6b898f04697be62866d297dfd300e591b37c9924 /libavutil/frame.h | |
| parent | 2a3c36e920d958e99fb4edf065a6713c30f2c2a9 (diff) | |
| parent | 1ef9e8376466bb1e2c147e47554b94cab9c8b04a (diff) | |
Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
avcodec: Deprecate dtg_active_format field in favor of avframe side-data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavcodec/version.h
libavfilter/vf_showinfo.c
libavutil/frame.h
libavutil/version.h
See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index ca76c6e19f..6ff372749a 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -83,21 +83,20 @@ enum AVFrameSideDataType { */ AV_FRAME_DATA_DISPLAYMATRIX, /** - * Active Format Description data consisting of a single byte as specified in ETSI TS 101 154 - * using AVActiveFormatDescription enum + * 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, +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 + AV_AFD_SP_4_3 = 15, }; typedef struct AVFrameSideData { |