virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

fixing demuxing of DV5700.asf

Browse Source 
Originally committed as revision 4138 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-04-19 00:35:08 +00:00
parent e91f4bf160
commit 0ffd77b96b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/asf.c
View File

@ -182,7 +182,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
asf->packet_size = asf->hdr.max_pktsize; asf->packet_size = asf->hdr.max_pktsize;
asf->nb_packets = asf->hdr.packets_count; asf->nb_packets = asf->hdr.packets_count;
} else if (!memcmp(&g, &stream_header, sizeof(GUID))) { } else if (!memcmp(&g, &stream_header, sizeof(GUID))) {
int type, total_size, type_specific_size; int type, total_size, type_specific_size, sizeX;
unsigned int tag1; unsigned int tag1;
int64_t pos1, pos2; int64_t pos1, pos2;
@ -264,7 +264,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_le32(pb); get_le32(pb);
get_byte(pb); get_byte(pb);
size = get_le16(pb); /* size */ size = get_le16(pb); /* size */
get_le32(pb); /* size */ sizeX= get_le32(pb); /* size */
st->codec.width = get_le32(pb); st->codec.width = get_le32(pb);
st->codec.height = get_le32(pb); st->codec.height = get_le32(pb);
/* not available for asf */ /* not available for asf */
@ -272,6 +272,8 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec.bits_per_sample = get_le16(pb); /* depth */ st->codec.bits_per_sample = get_le16(pb); /* depth */
tag1 = get_le32(pb); tag1 = get_le32(pb);
url_fskip(pb, 20); url_fskip(pb, 20);
// av_log(NULL, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX);
size= sizeX;
if (size > 40) { if (size > 40) {
st->codec.extradata_size = size - 40; st->codec.extradata_size = size - 40;
st->codec.extradata = av_mallocz(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); st->codec.extradata = av_mallocz(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);