diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:07:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:07:04 +0200 |
| commit | cd0dc88751db969964e7b40c4d4b5fd446ac1589 (patch) | |
| tree | 287290217843c6aeefc76b1f0ed9ada495820bba /libavcodec/h264.h | |
| parent | c67690f854452df397f3f735d0ff107a3fe51d87 (diff) | |
| parent | 18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09 (diff) | |
| download | ffmpeg-cd0dc88751db969964e7b40c4d4b5fd446ac1589.tar.gz | |
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
h264: parse display orientation SEI message
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 943adaa952..bf4255bbfd 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -136,6 +136,7 @@ typedef enum { 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 + SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation } SEI_Type; /** @@ -674,6 +675,13 @@ typedef struct H264Context { int quincunx_subsampling; /** + * display orientation SEI message + */ + int sei_display_orientation_present; + int sei_anticlockwise_rotation; + int sei_hflip, sei_vflip; + + /** * 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). |