Revision d862fce7

View differences:

libavformat/mov.c
1671 1671
    sc->width = width >> 16;
1672 1672
    sc->height = height >> 16;
1673 1673

  
1674
    //transform the display width/height according to the matrix
1674
    // transform the display width/height according to the matrix
1675 1675
    // skip this if the display matrix is the default identity matrix
1676
    // or if it is rotating the picture, ex iPhone 3GS
1676 1677
    // to keep the same scale, use [width height 1<<16]
1677 1678
    if (width && height &&
1678
        (display_matrix[0][0] != 65536 || display_matrix[0][1]           ||
1679
        display_matrix[1][0]           || display_matrix[1][1] != 65536  ||
1680
        display_matrix[2][0]           || display_matrix[2][1])) {
1679
        ((display_matrix[0][0] != 65536  ||
1680
          display_matrix[1][1] != 65536) &&
1681
         !display_matrix[0][1] &&
1682
         !display_matrix[1][0] &&
1683
         !display_matrix[2][0] && !display_matrix[2][1])) {
1681 1684
        for (i = 0; i < 2; i++)
1682 1685
            disp_transform[i] =
1683 1686
                (int64_t)  width  * display_matrix[0][i] +

Also available in: Unified diff