diff options
| author | Felix Abecassis <felix.abecassis@gmail.com> | 2014-08-07 11:42:36 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-08-07 11:31:47 +0100 |
| commit | a7e541c9926d531a100ba0d36f4e56956dd84651 (patch) | |
| tree | 5b6dbbbe4a66155e9e0dde09bbb697df7a18cb46 | |
| parent | b50173a4dd47b9c3c89845b781fa958ccf860929 (diff) | |
| download | ffmpeg-a7e541c9926d531a100ba0d36f4e56956dd84651.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>
| -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 ba30e5d38e..7d1109cb89 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -800,10 +800,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 4f44a06548..6388b6ce6c 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -207,10 +207,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: |