diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-12-05 23:21:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-12-05 23:21:39 +0000 |
| commit | 423962dc0105530852c9a25c478efbb8de9bcdf4 (patch) | |
| tree | 27159615668eb8da9b5b8082c59afcccd6e91d40 /libavformat/rm.c | |
| parent | 20b02bc62801e34f2d561c2f77154604b52e6358 (diff) | |
next try at fixing rv20 decoding
Originally committed as revision 3728 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rm.c')
| -rw-r--r-- | libavformat/rm.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libavformat/rm.c b/libavformat/rm.c index 0b280e9e9d..ec8845fedd 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -634,6 +634,7 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) /* ra type header */ rm_read_audio_stream_info(s, st, 0); } else { + int fps, fps2; if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) { fail1: av_log(&st->codec, AV_LOG_ERROR, "Unsupported video codec\n"); @@ -647,14 +648,24 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec.width = get_be16(pb); st->codec.height = get_be16(pb); st->codec.frame_rate_base= 1; - st->codec.frame_rate = get_be16(pb) * st->codec.frame_rate_base; + fps= get_be16(pb); st->codec.codec_type = CODEC_TYPE_VIDEO; get_be32(pb); + fps2= get_be16(pb); get_be16(pb); - get_be32(pb); - get_be16(pb); + + st->codec.extradata_size= codec_data_size - (url_ftell(pb) - codec_pos); + st->codec.extradata= av_malloc(st->codec.extradata_size); + get_buffer(pb, st->codec.extradata, st->codec.extradata_size); + +// av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2); + st->codec.frame_rate = fps * st->codec.frame_rate_base; /* modification of h263 codec version (!) */ - h263_hack_version = get_be32(pb); +#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; if((h263_hack_version>>28)==1) st->codec.codec_id = CODEC_ID_RV10; |