Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'

* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043':
  mov: store display matrix in a stream side data

Conflicts:
	libavformat/isom.h
	libavformat/mov.c

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

1 files changed, 2 insertions, 0 deletions

diff --git a/libavformat/isom.h b/libavformat/isom.h
index a929ebf05e..a5934af4b9 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -145,6 +145,8 @@ typedef struct MOVStreamContext {
 
     int nb_frames_for_fps;
     int64_t duration_for_fps;
+
+    int32_t *display_matrix;
 } MOVStreamContext;
 
 typedef struct MOVContext {