aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2011-08-14 20:02:26 +0200
committerDiego Biurrun <diego@biurrun.de>2011-08-15 14:03:01 +0200
commite9fb7636114f2d3b99734abaf5136f6c4f1b3db9 (patch)
tree6c84b7ed43c7f74e05fd8dae544cf07d4407ea6c
parent2bfdb34c8a61c96042752dac18499ce8381c1e69 (diff)
downloadffmpeg-e9fb7636114f2d3b99734abaf5136f6c4f1b3db9.tar.gz
Remove redundant and dubious video codec detection by its extradata
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--libavformat/rmdec.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 3f4d333c47..54267485b7 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -307,16 +307,6 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
// av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
st->codec->time_base.den = fps * st->codec->time_base.num;
- //XXX: do we really need that?
- switch(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;
- case 4: st->codec->codec_id = CODEC_ID_RV40; break;
- default:
- av_log(st->codec, AV_LOG_ERROR, "extra:%02X %02X %02X %02X %02X\n", st->codec->extradata[0], st->codec->extradata[1], st->codec->extradata[2], st->codec->extradata[3], st->codec->extradata[4]);
- goto fail1;
- }
}
skip: