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/rawdec.c | |
| parent | ed962414bd66027ce67ded912c17e08970163f52 (diff) | |
| parent | b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a (diff) | |
| download | ffmpeg-233dbee3bc98f4da23cd677a79553be9f14bbce8.tar.gz | |
Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a'
* commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a':
rawvideo: Support decoding YVYU422 FourCC
See: ab7d6cb8f770c3b88a8139d1182fcc934062f891
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 10 |
1 files changed, 0 insertions, 10 deletions
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; |