[FFmpeg-cvslog] r19271 - trunk/libavformat/mov.c

[bcoudurier]

Author: bcoudurier
Date: Thu Jun 25 02:17:47 2009
New Revision: 19271

Log:
only set par if it does not indicates a rotation, ex iphone 3GS

Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Thu Jun 25 01:04:05 2009	(r19270)
+++ trunk/libavformat/mov.c	Thu Jun 25 02:17:47 2009	(r19271)
@@ -1671,13 +1671,16 @@ static int mov_read_tkhd(MOVContext *c, 
     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] +