Disable dshow specific bug emulation for amv files as they arent

demuxed by ms dshows buggy demuxer normally.

Originally committed as revision 24012 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-07-02 23:39:02 +00:00
parent 89ac23cd40
commit 9862f9e149

View File

@ -593,8 +593,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->codec_id = CODEC_ID_XAN_DPCM; st->codec->codec_id = CODEC_ID_XAN_DPCM;
st->codec->codec_tag = 0; st->codec->codec_tag = 0;
} }
if (amv_file_format) if (amv_file_format){
st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV;
ast->dshow_block_align = 0;
}
break; break;
default: default:
st->codec->codec_type = AVMEDIA_TYPE_DATA; st->codec->codec_type = AVMEDIA_TYPE_DATA;