projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89ac23c
)
Disable dshow specific bug emulation for amv files as they arent
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 2 Jul 2010 23:39:02 +0000
(23:39 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 2 Jul 2010 23:39:02 +0000
(23:39 +0000)
demuxed by ms dshows buggy demuxer normally.
Originally committed as revision 24012 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
ec24a6e
..
cdf8307
100644
(file)
--- 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;