From cb37931d78dfb7c359d43209741d2267c78fdeb0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 30 Sep 2006 11:50:03 +0000 Subject: dont set sub_id as its completly redundant and silly Originally committed as revision 6393 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rm.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libavformat/rm.c') diff --git a/libavformat/rm.c b/libavformat/rm.c index f5b6a4ed06..ceae5c3c30 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -761,14 +761,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) // av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2); st->codec->time_base.den = fps * st->codec->time_base.num; - /* modification of h263 codec version (!) */ -#ifdef WORDS_BIGENDIAN - h263_hack_version = ((uint32_t*)st->codec->extradata)[1]; -#else - h263_hack_version = bswap_32(((uint32_t*)st->codec->extradata)[1]); -#endif - st->codec->sub_id = h263_hack_version; - switch((h263_hack_version>>28)){ + switch(((uint8_t*)st->codec->extradata)[4]>>4){ 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; -- cgit v1.2.3