[SCM] libav/experimental: h264: fix interpretation of interleved stereo modes

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a7e541c9926d531a100ba0d36f4e56956dd84651
Author: Felix Abecassis <felix.abecassis at gmail.com>
Date:   Thu Aug 7 11:42:36 2014 +0200

    h264: fix interpretation of interleved stereo modes
    
    Column and row frame packing arrangements were inverted.
    
    Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ba30e5d..7d1109c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -800,10 +800,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 4f44a06..6388b6c 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -207,10 +207,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:

-- 
Libav/FFmpeg packaging