diff options
| author | Felix Abecassis <felix.abecassis@gmail.com> | 2014-08-07 11:42:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 22:40:50 +0200 |
| commit | 69281934935e0b93e20fa905c1cdbc5a1b24fd2a (patch) | |
| tree | 7af92db57d748dcad447a9831ffa3c965a0519a9 | |
| parent | a72b7286e6db0f5ffac386bb13fe6efe55fb0b12 (diff) | |
| download | ffmpeg-69281934935e0b93e20fa905c1cdbc5a1b24fd2a.tar.gz | |
h264: fix interpretation of interleved stereo modes
Column and row frame packing arrangements were inverted.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
(cherry picked from commit a7e541c9926d531a100ba0d36f4e56956dd84651)
Signed-off-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 1d919872fe..f110a67cb5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -841,10 +841,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 edf6fc6130..ab3d59a272 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -236,10 +236,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: |