summaryrefslogtreecommitdiff
path: root/libavformat/asf.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-04-19 00:35:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-04-19 00:35:08 +0000
commit0ffd77b96b19938caed55f0bdea800638344d4a5 (patch)
tree90195e774f889635e2e466908f59925130cc0fb9 /libavformat/asf.c
parente91f4bf1606801d53c33234d0f5ff3a7138a6f3f (diff)
fixing demuxing of DV5700.asf
Originally committed as revision 4138 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.c')
-rw-r--r--libavformat/asf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 25bed2f450..cda6f2bb93 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -182,7 +182,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, type_specific_size;
+ int type, total_size, type_specific_size, sizeX;
unsigned int tag1;
int64_t pos1, pos2;
@@ -264,7 +264,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_le32(pb);
get_byte(pb);
size = get_le16(pb); /* size */
- get_le32(pb); /* size */
+ sizeX= get_le32(pb); /* size */
st->codec.width = get_le32(pb);
st->codec.height = get_le32(pb);
/* 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 */
tag1 = get_le32(pb);
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) {
st->codec.extradata_size = size - 40;
st->codec.extradata = av_mallocz(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);