summaryrefslogtreecommitdiff
path: root/libavformat/rm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-11-19 16:36:30 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-11-19 16:36:30 +0000
commit6ccedec0fde72538a164d9321cf59daad90caabc (patch)
tree5c2ab1cca5f45a040ef9880ecaaed49cba8552f8 /libavformat/rm.c
parentec892563ae41e5f694dcd3d68b0299478b1552c0 (diff)
rv20 demuxing fix
Originally committed as revision 3691 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rm.c')
-rw-r--r--libavformat/rm.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/libavformat/rm.c b/libavformat/rm.c
index 59888e2cdf..4e0ca2845e 100644
--- a/libavformat/rm.c
+++ b/libavformat/rm.c
@@ -653,19 +653,11 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_be16(pb);
/* modification of h263 codec version (!) */
h263_hack_version = get_be32(pb);
- switch(h263_hack_version) {
- case 0x10000000:
- case 0x10003000:
- case 0x10003001:
- default:
- st->codec.sub_id = h263_hack_version;
+ st->codec.sub_id = h263_hack_version;
+ if((h263_hack_version>>28)==1)
st->codec.codec_id = CODEC_ID_RV10;
- break;
-// default:
- /* not handled */
- st->codec.codec_id = CODEC_ID_NONE;
- break;
- }
+ else
+ st->codec.codec_id = CODEC_ID_RV20;
}
/* skip codec info */
size = url_ftell(pb) - codec_pos;