aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libx264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-07 20:21:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-07 20:22:16 +0200
commit2bf87dcc2d3079ead09b250df6932c94ff13504c (patch)
treeba8b9cfcc3d9a06fea0a441f09eccc0908d5531c /libavcodec/libx264.c
parent4e70104aba4269770c36fc6e0ec975b7a061d028 (diff)
parenta7e541c9926d531a100ba0d36f4e56956dd84651 (diff)
downloadffmpeg-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/libx264.c')
-rw-r--r--libavcodec/libx264.c4
1 files changed, 2 insertions, 2 deletions
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: