From 94ef68647cef9aafef946ae0fc07cc874d5a6084 Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Wed, 24 Jul 2002 17:56:25 +0000 Subject: suppressed packet size dependancy Originally committed as revision 798 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libav/au.c | 12 ++++-------- libav/wav.c | 8 ++------ 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'libav') diff --git a/libav/au.c b/libav/au.c index dd34bb72c4..5b4c84859a 100644 --- a/libav/au.c +++ b/libav/au.c @@ -159,17 +159,13 @@ static int au_read_header(AVFormatContext *s, #define MAX_SIZE 4096 static int au_read_packet(AVFormatContext *s, - AVPacket *pkt) + AVPacket *pkt) { - int packet_size, n, ret; + int ret; if (url_feof(&s->pb)) return -EIO; - packet_size = url_get_packet_size(&s->pb); - n = MAX_SIZE / packet_size; - if (n <= 0) - return n = 1; - if (av_new_packet(pkt, n * packet_size)) + if (av_new_packet(pkt, MAX_SIZE)) return -EIO; pkt->stream_index = 0; @@ -179,7 +175,7 @@ static int au_read_packet(AVFormatContext *s, /* note: we need to modify the packet size here to handle the last packet */ pkt->size = ret; - return ret; + return 0; } static int au_read_close(AVFormatContext *s) diff --git a/libav/wav.c b/libav/wav.c index 9e3d9ef0bb..7fb3bd3328 100644 --- a/libav/wav.c +++ b/libav/wav.c @@ -267,15 +267,11 @@ static int wav_read_header(AVFormatContext *s, static int wav_read_packet(AVFormatContext *s, AVPacket *pkt) { - int packet_size, n, ret; + int ret; if (url_feof(&s->pb)) return -EIO; - packet_size = url_get_packet_size(&s->pb); - n = MAX_SIZE / packet_size; - if (n <= 0) - return n = 1; - if (av_new_packet(pkt, n * packet_size)) + if (av_new_packet(pkt, MAX_SIZE)) return -EIO; pkt->stream_index = 0; -- cgit v1.2.3