Merge commit '7601f9412a2d3387617a45966b65b452a632c27a'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8fa35c74d10e2c7a98af487d552328a52e0e178c..76161e9730a942087b7285b648946fa896fe755f 100644 (file)
--- 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)