Message ID | AM7PR03MB66600C01102C8D158E3A54C88F799@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | b8a4b273bea57c4004f2c90fd8a7618f3757eece |
Headers | show |
Series | [FFmpeg-devel,1/4] avcodec/mjpegdec: Fix exif rotation->displaymatrix conversion | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
Andreas Rheinhardt: > 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> > --- > This whole patchset relies on the mismatch in av_display_rotation_set() > being solved by keeping the current behaviour and updating the > documentation. > > libavcodec/mjpegdec.c | 4 ++-- > 1 file 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); > Will apply this patchset tonight unless there are objections. - Andreas
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);
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> --- This whole patchset relies on the mismatch in av_display_rotation_set() being solved by keeping the current behaviour and updating the documentation. libavcodec/mjpegdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)