diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 01:35:53 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 01:35:53 +0400 |
| commit | 1a34478b7183b1a08caab7eac56b452609725736 (patch) | |
| tree | 4ddae5c3407716d83b592694cdabbdb3dff3041f /libavformat/rmdec.c | |
| parent | 6ae356c9a0987d56f60137f9784afcb3a9303037 (diff) | |
| parent | cc73511e8e81b2e1454f406acb71da9fd1c60d32 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix NASM include directive
dsputil_mmx: Honor HAVE_AMD3DNOW
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
jack: add 'channels' private option.
VC-1: fix reading of custom PAR.
Remove redundant and dubious video codec detection by its extradata
mpeg12: remove repeat-field code disabled since May 2002
patch checklist: suggest fate instead of regression tests
Turn on resampling on sudden size change instead of bailing out during recode.
avtools: reinitialise filter chain when input video stream changes dimensions
Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index effb7d3a00..461c45c81c 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: |