Commit 13859ac9 authored by Michael Niedermayer's avatar Michael Niedermayer

dont be so picky

Originally committed as revision 3370 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e44cad52
...@@ -639,7 +639,8 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -639,7 +639,8 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
goto fail; goto fail;
} }
st->codec.codec_tag = get_le32(pb); st->codec.codec_tag = get_le32(pb);
if (st->codec.codec_tag != MKTAG('R', 'V', '1', '0')) if ( st->codec.codec_tag != MKTAG('R', 'V', '1', '0')
&& st->codec.codec_tag != MKTAG('R', 'V', '2', '0'))
goto fail1; goto fail1;
st->codec.width = get_be16(pb); st->codec.width = get_be16(pb);
st->codec.height = get_be16(pb); st->codec.height = get_be16(pb);
...@@ -656,10 +657,11 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -656,10 +657,11 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
case 0x10000000: case 0x10000000:
case 0x10003000: case 0x10003000:
case 0x10003001: case 0x10003001:
default:
st->codec.sub_id = h263_hack_version; st->codec.sub_id = h263_hack_version;
st->codec.codec_id = CODEC_ID_RV10; st->codec.codec_id = CODEC_ID_RV10;
break; break;
default: // default:
/* not handled */ /* not handled */
st->codec.codec_id = CODEC_ID_NONE; st->codec.codec_id = CODEC_ID_NONE;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment