Changeset cf70ba37 in ffmpeg

Timestamp:

Jan 14, 2015, 4:17:23 PM (10 years ago)

Author:

Vittorio Giovara <vittorio.giovara@gmail.com>

Branches:

master

Children:

89b6382, e2ad0b66

Parents:

1e763454

git-author:

Vittorio Giovara <vittorio.giovara@gmail.com> (01/09/15 10:24:22)

git-committer:

Vittorio Giovara <vittorio.giovara@gmail.com> (01/14/15 16:17:23)

Message:

mov: Check angle rather than full matrix when updating SAR

When the display matrix is not the identity one, but the rotation angle
is zero, there is no need to update the sample aspect ratio.

Otherwise, it is possible to obtain negative values which interferes
with transcoding in later stages. This kind of behaviour is reproducible
on mov files with "major_brand: MSNV".

CC: ​libav-stable@libav.org
Signed-off-by: Vittorio Giovara <​vittorio.giovara@gmail.com>

File:

• libavformat/mov.c (modified) (2 diffs)

libavformat/mov.c

@@ -36 +36 @@
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
+#include "libavutil/display.h"
 #include "libavutil/opt.h"
 #include "libavcodec/ac3tab.h"
@@ -2579 +2580 @@
 
     // 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
+    // skip this if the rotation angle is 0 degrees
     // to keep the same scale, use [width height 1<<16]
-    if (width && height &&
-        ((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])) {
+    if (width && height && sc->display_matrix &&
+        av_display_rotation_get(sc->display_matrix) != 0.0f) {
         for (i = 0; i < 2; i++)
             disp_transform[i] =