mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e'
* commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e': mov: Check angle rather than full matrix when updating SAR Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
89b6382bec
|
@ -29,13 +29,13 @@
|
||||||
|
|
||||||
#include "libavutil/attributes.h"
|
#include "libavutil/attributes.h"
|
||||||
#include "libavutil/channel_layout.h"
|
#include "libavutil/channel_layout.h"
|
||||||
#include "libavutil/display.h"
|
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
#include "libavutil/intfloat.h"
|
#include "libavutil/intfloat.h"
|
||||||
#include "libavutil/mathematics.h"
|
#include "libavutil/mathematics.h"
|
||||||
#include "libavutil/time_internal.h"
|
#include "libavutil/time_internal.h"
|
||||||
#include "libavutil/avstring.h"
|
#include "libavutil/avstring.h"
|
||||||
#include "libavutil/dict.h"
|
#include "libavutil/dict.h"
|
||||||
|
#include "libavutil/display.h"
|
||||||
#include "libavutil/opt.h"
|
#include "libavutil/opt.h"
|
||||||
#include "libavutil/timecode.h"
|
#include "libavutil/timecode.h"
|
||||||
#include "libavcodec/ac3tab.h"
|
#include "libavcodec/ac3tab.h"
|
||||||
|
@ -2867,15 +2867,10 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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
|
// skip this if the rotation angle is 0 degrees
|
||||||
// or if it is rotating the picture, ex iPhone 3GS
|
|
||||||
// to keep the same scale, use [width height 1<<16]
|
// to keep the same scale, use [width height 1<<16]
|
||||||
if (width && height &&
|
if (width && height && sc->display_matrix &&
|
||||||
((display_matrix[0][0] != 65536 ||
|
av_display_rotation_get(sc->display_matrix) != 0.0f) {
|
||||||
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++)
|
for (i = 0; i < 2; i++)
|
||||||
disp_transform[i] =
|
disp_transform[i] =
|
||||||
(int64_t) width * display_matrix[0][i] +
|
(int64_t) width * display_matrix[0][i] +
|
||||||
|
|
Loading…
Reference in New Issue