diff options
| author | Eric Lasota <riot@icculus.org> | 2007-06-05 08:05:16 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2007-06-05 08:05:16 +0000 |
| commit | 3ccda4ca91fea976552efed050e90ba44489c572 (patch) | |
| tree | 28b345c55c874eb56fde42e6b614771f53e639dd /libavcodec/roqvideodec.c | |
| parent | f0edfda5782158d0485c68200ce0d41d06c93027 (diff) | |
Convert RoQ decoder to use YUV 4:4:4 unpacked macroblocks
instead of packed 4:2:0 clusters
patch by Eric Lasota: \ riot icculus org /
original threads: [FFmpeg-devel] [PATCH] RoQ decoder 4:4:4 update
date: 06/04/2007 03:52 AM and 06/05/2007 01:10 AM
Originally committed as revision 9223 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/roqvideodec.c')
| -rw-r--r-- | libavcodec/roqvideodec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index f0601ef52b..4608c03150 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -36,9 +36,6 @@ #include "dsputil.h" #include "roqvideo.h" -#define avg2(a,b) av_clip_uint8(((int)(a)+(int)(b)+1)>>1) -#define avg4(a,b,c,d) av_clip_uint8(((int)(a)+(int)(b)+(int)(c)+(int)(d)+2)>>2) - static void roqvideo_decode_frame(RoqContext *ri) { unsigned int chunk_id = 0, chunk_arg = 0; @@ -165,7 +162,7 @@ static int roq_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->last_frame = &s->frames[0]; s->current_frame = &s->frames[1]; - avctx->pix_fmt = PIX_FMT_YUV420P; + avctx->pix_fmt = PIX_FMT_YUV444P; dsputil_init(&s->dsp, avctx); return 0; |