eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4

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

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 03:22:15 +01:00
parent fb62580fb6 88411b87b4
commit 02d979d007
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -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);
}
}

2
libavcodec/hevc.c
View File

@@ -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;