[FFmpeg-cvslog] h264: fix interpretation of interleaved stereo modes

[Felix Abecassis]

ffmpeg | branch: release/2.2 | Felix Abecassis <felix.abecassis at gmail.com> | Thu Aug  7 11:42:36 2014 +0200| [67134ad31f1f3bc1515eae129e4368401f7c3342] | committer: Vittorio Giovara

h264: fix interpretation of interleaved stereo modes

Column and row frame packing arrangements were inverted.

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67134ad31f1f3bc1515eae129e4368401f7c3342
---

 libavcodec/h264.c    |    4 ++--
 libavcodec/libx264.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 29b96c4..aee8db0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2045,10 +2045,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 abf0a3e..78808f3 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -175,10 +175,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: