diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 22:51:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 22:54:33 +0200 |
| commit | 7e9c7b623f051eea2e9565a260dae071f873cb42 (patch) | |
| tree | e1d8eba0aa2b89355ee28c9bcc0af207320afaf6 /libavcodec/h264.h | |
| parent | 8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3 (diff) | |
| parent | 271ce76d317c5432e151216cf23f12b77ed6cb7e (diff) | |
| download | ffmpeg-7e9c7b623f051eea2e9565a260dae071f873cb42.tar.gz | |
Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'
* commit '271ce76d317c5432e151216cf23f12b77ed6cb7e':
h264: Parse registered data SEI message and AFD value
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_sei.c
libavcodec/version.h
See: d6e95669496a89d186f923c34bcaf7d86b7cd59c
See: 22291c372fa703242e8429bed61700ba81258f19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 15b9a5da12..f0d569b65f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -132,7 +132,7 @@ enum { typedef enum { SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) SEI_TYPE_PIC_TIMING = 1, ///< picture timing - SEI_TYPE_USER_DATA_ITU_T_T35 = 4, ///< user data registered by ITU-T Recommendation T.35 + SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as specified by Rec. ITU-T T.35 SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement @@ -725,6 +725,12 @@ typedef struct H264Context { int sei_hflip, sei_vflip; /** + * User data registered by Rec. ITU-T T.35 SEI + */ + int sei_reguserdata_afd_present; + uint8_t active_format_description; + + /** * Bit set of clock types for fields/frames in picture timing SEI message. * For each found ct_type, appropriate bit is set (e.g., bit 1 for * interlaced). @@ -782,9 +788,6 @@ typedef struct H264Context { int missing_fields; - uint8_t afd; - int has_afd; - /* for frame threading, this is set to 1 * after finish_setup() has been called, so we cannot modify |