From d862fce758f5f084fbe9a82c1dd32e413af1703a Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 25 Jun 2009 00:17:47 +0000 Subject: [PATCH] only set par if it does not indicates a rotation, ex iphone 3GS Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a5583495c..74698e054 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1671,13 +1671,16 @@ static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) sc->width = width >> 16; sc->height = height >> 16; - //transform the display width/height according to the matrix + // transform the display width/height according to the matrix // skip this if the display matrix is the default identity matrix + // or if it is rotating the picture, ex iPhone 3GS // to keep the same scale, use [width height 1<<16] if (width && height && - (display_matrix[0][0] != 65536 || display_matrix[0][1] || - display_matrix[1][0] || display_matrix[1][1] != 65536 || - display_matrix[2][0] || display_matrix[2][1])) { + ((display_matrix[0][0] != 65536 || + display_matrix[1][1] != 65536) && + !display_matrix[0][1] && + !display_matrix[1][0] && + !display_matrix[2][0] && !display_matrix[2][1])) { for (i = 0; i < 2; i++) disp_transform[i] = (int64_t) width * display_matrix[0][i] + -- 2.11.0