diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2004-09-19 19:24:56 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2004-09-19 19:24:56 +0000 |
| commit | 2c3cee348f798471b01eaf62983b471b311013f6 (patch) | |
| tree | 65c1191a4fe6a4629482304ba963e9381e9b0eb7 /libavformat | |
| parent | 1f0182250aede7baf92e8f7326560280ab7c3f46 (diff) | |
| download | ffmpeg-2c3cee348f798471b01eaf62983b471b311013f6.tar.gz | |
* fix for a DV regression introduced with the last round of avi_read_packet
fixes.
Originally committed as revision 3482 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index d62ccee627..2de340c818 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -179,14 +179,19 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) handler != MKTAG('d', 'v', 's', 'l')) goto fail; + ast = s->streams[0]->priv_data; av_freep(&s->streams[0]->codec.extradata); av_freep(&s->streams[0]); s->nb_streams = 0; avi->dv_demux = dv_init_demux(s); if (!avi->dv_demux) goto fail; + s->streams[0]->priv_data = ast; + url_fskip(pb, 3 * 4); + ast->scale = get_le32(pb); + ast->rate = get_le32(pb); stream_index = s->nb_streams - 1; - url_fskip(pb, size - 8); + url_fskip(pb, size - 7*4); break; case MKTAG('v', 'i', 'd', 's'): codec_type = CODEC_TYPE_VIDEO; |