diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:14:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:14:31 +0100 |
| commit | dfea1acb21f3a3945d04537855ab6412c2b4e323 (patch) | |
| tree | 5eb54b082827af6f57b2ea5fd62570981f9e311a /libavformat/mov.c | |
| parent | 001b28b0211b6501f9ffa1e6187b8a111901464f (diff) | |
| parent | e4fe535d12f4f30df2dd672e30304af112a5a827 (diff) | |
| download | ffmpeg-streaming-dfea1acb21f3a3945d04537855ab6412c2b4e323.zip ffmpeg-streaming-dfea1acb21f3a3945d04537855ab6412c2b4e323.tar.gz | |
Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
mov: Write the display matrix in order
Conflicts:
libavformat/mov.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 09f2097..1f57dab 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2949,7 +2949,7 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (i = 0; i < 3; i++) for (j = 0; j < 3; j++) - sc->display_matrix[i * 3 + j] = display_matrix[j][i]; + sc->display_matrix[i * 3 + j] = display_matrix[i][j]; rotate = av_display_rotation_get(sc->display_matrix); if (!isnan(rotate)) { |
