diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:51:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:51:29 +0200 |
| commit | 0dc5868f141c1877dc530437643cc927f1c158b3 (patch) | |
| tree | 5346a6ed2b3e5376a730b6205b57685984d04e95 | |
| parent | 723512ac71716d1f27ed33f4742913cba3e47ae5 (diff) | |
| parent | 67134ad31f1f3bc1515eae129e4368401f7c3342 (diff) | |
| download | ffmpeg-0dc5868f141c1877dc530437643cc927f1c158b3.tar.gz | |
Merge commit '67134ad31f1f3bc1515eae129e4368401f7c3342' into release/2.2
* commit '67134ad31f1f3bc1515eae129e4368401f7c3342':
h264: fix interpretation of interleaved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 4 | ||||
| -rw-r--r-- | libavcodec/libx264.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d855b7bfb7..5db5c76daa 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2142,10 +2142,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 685a066ce6..0f5f51cde5 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -202,10 +202,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: |