diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:53:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:53:23 +0100 |
| commit | be6e81463c72dda837d62ef0a7c26f35a666d1d3 (patch) | |
| tree | 54e21d585a93dfb9d1adf47c5c4d2513154b043c /libavcodec/h264.h | |
| parent | 7a6034805305cb5d6a3d755d774f0ad09119049e (diff) | |
| parent | 5b10ef729f610fcbc9c485e7b643ce53268144cb (diff) | |
| download | ffmpeg-be6e81463c72dda837d62ef0a7c26f35a666d1d3.tar.gz | |
Merge commit '5b10ef729f610fcbc9c485e7b643ce53268144cb'
* commit '5b10ef729f610fcbc9c485e7b643ce53268144cb':
h264: parse frame packing arrangement SEI messages and save relevant stereo3d information
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.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 b7e1214a76..0d08d34013 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -617,6 +617,14 @@ typedef struct H264Context { int prev_interlaced_frame; /** + * frame_packing_arrangment SEI message + */ + int sei_frame_packing_present; + int frame_packing_arrangement_type; + int content_interpretation_type; + int quincunx_subsampling; + + /** * 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). |