diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-03-12 01:35:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-03-12 01:35:47 +0000 |
| commit | 2e7973bbe7c8c98acb0bd9cdd828a6f8cba02e98 (patch) | |
| tree | 57eea2484a6457a2bf1954ded6f354601241d1a5 /libavformat/asf.c | |
| parent | 69db4e10f27abe4d3a7036d5cdb29e1f9745c7a4 (diff) | |
| download | ffmpeg-2e7973bbe7c8c98acb0bd9cdd828a6f8cba02e98.tar.gz | |
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
Originally committed as revision 1664 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.c')
| -rw-r--r-- | libavformat/asf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index 5edde52ca5..b9cd71e432 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -806,7 +806,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) asf->packet_size = asf->hdr.max_pktsize; asf->nb_packets = asf->hdr.packets_count; } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { - int type, total_size; + int type, total_size, type_specific_size; unsigned int tag1; int64_t pos1, pos2; @@ -832,7 +832,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) } get_guid(pb, &g); total_size = get_le64(pb); - get_le32(pb); + type_specific_size = get_le32(pb); get_le32(pb); st->id = get_le16(pb) & 0x7f; /* stream id */ // mapping of asf ID to AV stream ID; @@ -842,7 +842,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec.codec_type = type; st->codec.frame_rate = 15 * s->pts_den / s->pts_num; // 15 fps default if (type == CODEC_TYPE_AUDIO) { - get_wav_header(pb, &st->codec, 1); + get_wav_header(pb, &st->codec, type_specific_size); /* We have to init the frame size at some point .... */ pos2 = url_ftell(pb); if (gsize > (pos2 + 8 - pos1 + 24)) { |