Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4

* commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2 files changed, 2 insertions, 2 deletions

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ba5bb407cc..e5073089d9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -878,7 +878,7 @@ static void decode_postinit(H264Context *h, int setup_finished)
         if (rotation) {
             av_display_rotation_set((int32_t *)rotation->data, angle);
             av_display_matrix_flip((int32_t *)rotation->data,
-                                   h->sei_vflip, h->sei_hflip);
+                                   h->sei_hflip, h->sei_vflip);
         }
     }
 
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 6aff880273..fa9854d737 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2532,7 +2532,7 @@ static int set_side_data(HEVCContext *s)
 
         av_display_rotation_set((int32_t *)rotation->data, angle);
         av_display_matrix_flip((int32_t *)rotation->data,
-                               s->sei_vflip, s->sei_hflip);
+                               s->sei_hflip, s->sei_vflip);
     }
 
     return 0;