diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 12:53:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 12:53:31 +0100 |
| commit | 76fa78911f58c9707226559e0f57be8d47fb2fca (patch) | |
| tree | 1b5e61e129fb1d3052e914daddc0962a8b3353fa /libavcodec/h264.c | |
| parent | 946a5cb64d580098e6abc399fd404e81fc816742 (diff) | |
| parent | b1b1a7370e141c912e3d0bbaa668dcee05c3ad67 (diff) | |
| download | ffmpeg-76fa78911f58c9707226559e0f57be8d47fb2fca.tar.gz | |
Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
display: fix order of operands
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 12713de56b..222bf58b10 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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); } } |