diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:21:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:22:16 +0200 |
| commit | 2bf87dcc2d3079ead09b250df6932c94ff13504c (patch) | |
| tree | ba8b9cfcc3d9a06fea0a441f09eccc0908d5531c /libavcodec | |
| parent | 4e70104aba4269770c36fc6e0ec975b7a061d028 (diff) | |
| parent | a7e541c9926d531a100ba0d36f4e56956dd84651 (diff) | |
| download | ffmpeg-2bf87dcc2d3079ead09b250df6932c94ff13504c.tar.gz | |
Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'
* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
h264: fix interpretation of interleved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 4 | ||||
| -rw-r--r-- | libavcodec/libx264.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8fa35c74d1..76161e9730 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -843,10 +843,10 @@ static void decode_postinit(H264Context *h, int setup_finished) stereo->type = AV_STEREO3D_CHECKERBOARD; break; case 1: - stereo->type = AV_STEREO3D_LINES; + stereo->type = AV_STEREO3D_COLUMNS; break; case 2: - stereo->type = AV_STEREO3D_COLUMNS; + stereo->type = AV_STEREO3D_LINES; break; case 3: if (h->quincunx_subsampling) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index edf6fc6130..ab3d59a272 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -236,10 +236,10 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, case AV_STEREO3D_CHECKERBOARD: fpa_type = 0; break; - case AV_STEREO3D_LINES: + case AV_STEREO3D_COLUMNS: fpa_type = 1; break; - case AV_STEREO3D_COLUMNS: + case AV_STEREO3D_LINES: fpa_type = 2; break; case AV_STEREO3D_SIDEBYSIDE: |