aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer2010-07-02 23:39:02 +0000
committerMichael Niedermayer2010-07-02 23:39:02 +0000
commit9862f9e149a20cca676b00dde0e01a73eda87ee0 (patch)
tree297b630ac5f25762b28d47aa038270fe1a554c47
parent89ac23cd4000dccb366217a431c5fd6783043759 (diff)
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
-rw-r--r--libavformat/avidec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index ec24a6e8ff..cdf8307298 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -593,8 +593,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->codec_id = CODEC_ID_XAN_DPCM;
st->codec->codec_tag = 0;
}
- if (amv_file_format)
+ if (amv_file_format){
st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV;
+ ast->dshow_block_align = 0;
+ }
break;
default:
st->codec->codec_type = AVMEDIA_TYPE_DATA;