Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: parse frame packing arrangement SEI messages and save relevant stereo3d information

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 6 insertions, 0 deletions

diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 74673a9f1a..bbb18973bd 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -886,6 +886,12 @@ typedef struct HEVCContext {
     int nal_length_size;    ///< Number of bytes used for nal length (1, 2 or 4)
     int nuh_layer_id;
 
+    /** frame packing arrangement variables */
+    int sei_frame_packing_present;
+    int frame_packing_arrangement_type;
+    int content_interpretation_type;
+    int quincunx_subsampling;
+
     int picture_struct;
 } HEVCContext;