CODEC_ID_PGMYUV,
CODEC_ID_PAM,
CODEC_ID_FFVHUFF,
+ CODEC_ID_RV30,
+ CODEC_ID_RV40,
+
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
extern AVCodec flv_decoder;
extern AVCodec rv10_decoder;
extern AVCodec rv20_decoder;
+extern AVCodec rv30_decoder;
+extern AVCodec rv40_decoder;
extern AVCodec svq1_decoder;
extern AVCodec svq3_decoder;
extern AVCodec dvvideo_decoder;
st->codec.codec_tag = get_le32(pb);
// av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec.codec_tag, MKTAG('R', 'V', '2', '0'));
if ( st->codec.codec_tag != MKTAG('R', 'V', '1', '0')
- && st->codec.codec_tag != MKTAG('R', 'V', '2', '0'))
+ && st->codec.codec_tag != MKTAG('R', 'V', '2', '0')
+ && st->codec.codec_tag != MKTAG('R', 'V', '3', '0')
+ && st->codec.codec_tag != MKTAG('R', 'V', '4', '0'))
goto fail1;
st->codec.width = get_be16(pb);
st->codec.height = get_be16(pb);
h263_hack_version = bswap_32(((uint32_t*)st->codec.extradata)[1]);
#endif
st->codec.sub_id = h263_hack_version;
- if((h263_hack_version>>28)==1)
- st->codec.codec_id = CODEC_ID_RV10;
- else
- st->codec.codec_id = CODEC_ID_RV20;
+ switch((h263_hack_version>>28)){
+ case 1: st->codec.codec_id = CODEC_ID_RV10; break;
+ case 2: st->codec.codec_id = CODEC_ID_RV20; break;
+ case 3: st->codec.codec_id = CODEC_ID_RV30; break;
+ case 4: st->codec.codec_id = CODEC_ID_RV40; break;
+ default: goto fail1;
+ }
}
skip:
/* skip codec info */