diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:15:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:19:43 +0200 |
| commit | efc66d69bfb622e874d883e0b304cf18b12e41bd (patch) | |
| tree | 01adc68c2448e4f1950c37348db09790b092f875 /libavcodec/hevc.h | |
| parent | cd0dc88751db969964e7b40c4d4b5fd446ac1589 (diff) | |
| parent | 0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50 (diff) | |
| download | ffmpeg-streaming-efc66d69bfb622e874d883e0b304cf18b12e41bd.zip ffmpeg-streaming-efc66d69bfb622e874d883e0b304cf18b12e41bd.tar.gz | |
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
hevc: parse display orientation SEI message
Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 7c7a459..5f964c3 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -885,6 +885,11 @@ typedef struct HEVCContext { int content_interpretation_type; int quincunx_subsampling; + /** display orientation */ + int sei_display_orientation_present; + int sei_anticlockwise_rotation; + int sei_hflip, sei_vflip; + int picture_struct; } HEVCContext; |
