Commit 2bf87dcc authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a7e541c9'

* commit 'a7e541c9':
  h264: fix interpretation of interleved stereo modes
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4e70104a a7e541c9
...@@ -843,10 +843,10 @@ static void decode_postinit(H264Context *h, int setup_finished) ...@@ -843,10 +843,10 @@ static void decode_postinit(H264Context *h, int setup_finished)
stereo->type = AV_STEREO3D_CHECKERBOARD; stereo->type = AV_STEREO3D_CHECKERBOARD;
break; break;
case 1: case 1:
stereo->type = AV_STEREO3D_LINES; stereo->type = AV_STEREO3D_COLUMNS;
break; break;
case 2: case 2:
stereo->type = AV_STEREO3D_COLUMNS; stereo->type = AV_STEREO3D_LINES;
break; break;
case 3: case 3:
if (h->quincunx_subsampling) if (h->quincunx_subsampling)
......
...@@ -236,10 +236,10 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, ...@@ -236,10 +236,10 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
case AV_STEREO3D_CHECKERBOARD: case AV_STEREO3D_CHECKERBOARD:
fpa_type = 0; fpa_type = 0;
break; break;
case AV_STEREO3D_LINES: case AV_STEREO3D_COLUMNS:
fpa_type = 1; fpa_type = 1;
break; break;
case AV_STEREO3D_COLUMNS: case AV_STEREO3D_LINES:
fpa_type = 2; fpa_type = 2;
break; break;
case AV_STEREO3D_SIDEBYSIDE: case AV_STEREO3D_SIDEBYSIDE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment