har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'

Browse Source 
* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
  h264: fix interpretation of interleved stereo modes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 20:21:56 +02:00
commit 2bf87dcc2d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -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)

4
libavcodec/libx264.c
View File

@ -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: