xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'

Browse Source 
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
  display: fix order of operands

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-13 12:53:31 +01:00
commit 76fa78911f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -877,7 +877,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

@ -2530,7 +2530,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;