diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:41:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 04:06:35 +0200 |
| commit | 233dbee3bc98f4da23cd677a79553be9f14bbce8 (patch) | |
| tree | b7e9de763692a5b0f3039f6983b412b6a54abe23 /libavcodec | |
| parent | ed962414bd66027ce67ded912c17e08970163f52 (diff) | |
| parent | b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a (diff) | |
Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'
* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
rawvideo: Support decoding YVYU422 FourCC
See: ab7d6cb8f770c3b88a8139d1182fcc934062f891
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/raw.c | 2 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 83b453c867..16b1b39945 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -53,6 +53,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') }, { AV_PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') }, { AV_PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') }, + { AV_PIX_FMT_YVYU422, MKTAG('Y', 'V', 'Y', 'U') }, /* Philips */ { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') }, { AV_PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') }, { AV_PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'V') }, @@ -219,7 +220,6 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { /* special */ { AV_PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */ { AV_PIX_FMT_YUV444P, MKTAG('Y', 'V', '2', '4') }, /* YUV444P, swapped UV */ - { AV_PIX_FMT_YUYV422, MKTAG('Y', 'V', 'Y', 'U') }, /* YUYV, swapped UV */ { AV_PIX_FMT_NONE, 0 }, }; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 85a69e91a5..790a4db7dc 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -373,16 +373,6 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, line += picture->linesize[0]; } } - if (avctx->codec_tag == AV_RL32("YVYU") && - avctx->pix_fmt == AV_PIX_FMT_YUYV422) { - int x, y; - uint8_t *line = picture->data[0]; - for(y = 0; y < avctx->height; y++) { - for(x = 0; x < avctx->width - 1; x += 2) - FFSWAP(uint8_t, line[2*x + 1], line[2*x + 3]); - line += picture->linesize[0]; - } - } if (avctx->field_order > AV_FIELD_PROGRESSIVE) { /* we have interlaced material flagged in container */ frame->interlaced_frame = 1; |