summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-12-18 21:15:33 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-12-23 18:09:46 +0100
commitb8a4b273bea57c4004f2c90fd8a7618f3757eece (patch)
tree56c7046e83a56994ea28f0d91fe945c5f80cd017 /libavcodec
parentcfa1f0e214d07f0fdc027f2ec760eb9fd3fac85e (diff)
avcodec/mjpegdec: Fix exif rotation->displaymatrix conversion
The cases in which there was flipping together with a rotation that is not a multiple of the identity were wrong. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 8b154ce0ab..0dbbc14bae 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2896,14 +2896,14 @@ the_end:
break;
case 5:
av_display_rotation_set(matrix, 90.0);
- av_display_matrix_flip(matrix, 0, 1);
+ av_display_matrix_flip(matrix, 1, 0);
break;
case 6:
av_display_rotation_set(matrix, 90.0);
break;
case 7:
av_display_rotation_set(matrix, -90.0);
- av_display_matrix_flip(matrix, 0, 1);
+ av_display_matrix_flip(matrix, 1, 0);
break;
case 8:
av_display_rotation_set(matrix, -90.0);