aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-09-29 23:57:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-09-29 23:57:03 +0000
commit78a5ec27aa915a731b386c851bf83982236af3e7 (patch)
tree0ae94da9d4f03306b7a244eca63666001f4537a0 /libavcodec/rv10.c
parent6d3124961b3ad904d17e37e69e63aeb060664dc7 (diff)
downloadffmpeg-78a5ec27aa915a731b386c851bf83982236af3e7.tar.gz
simplify
Originally committed as revision 6389 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 344a89d541..da78ae7f91 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -516,26 +516,24 @@ static int rv10_decode_init(AVCodecContext *avctx)
s->width = avctx->width;
s->height = avctx->height;
+ s->h263_long_vectors= !!(*(uint32_t*)avctx->extradata & 0x1000000);
+
switch(avctx->sub_id){
case 0x10000000:
s->rv10_version= 0;
- s->h263_long_vectors=0;
s->low_delay=1;
break;
case 0x10002000:
s->rv10_version= 3;
- s->h263_long_vectors=1;
s->low_delay=1;
s->obmc=1;
break;
case 0x10003000:
s->rv10_version= 3;
- s->h263_long_vectors=1;
s->low_delay=1;
break;
case 0x10003001:
s->rv10_version= 3;
- s->h263_long_vectors= !!(*(uint32_t*)avctx->extradata & 0x1000000);
s->low_delay=1;
break;
case 0x20001000: /* real rv20 decoder fail on this id */