generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suppressed packet size dependancy

Browse Source 
Originally committed as revision 798 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-07-24 17:56:25 +00:00
parent 0e2a219706
commit 94ef68647c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libav/au.c
View File

@ -159,17 +159,13 @@ static int au_read_header(AVFormatContext *s,
#define MAX_SIZE 4096 #define MAX_SIZE 4096
static int au_read_packet(AVFormatContext *s, static int au_read_packet(AVFormatContext *s,
AVPacket *pkt) AVPacket *pkt)
{ {
int packet_size, n, ret; int ret;
if (url_feof(&s->pb)) if (url_feof(&s->pb))
return -EIO; return -EIO;
packet_size = url_get_packet_size(&s->pb); if (av_new_packet(pkt, MAX_SIZE))
n = MAX_SIZE / packet_size;
if (n <= 0)
return n = 1;
if (av_new_packet(pkt, n * packet_size))
return -EIO; return -EIO;
pkt->stream_index = 0; 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 /* note: we need to modify the packet size here to handle the last
packet */ packet */
pkt->size = ret; pkt->size = ret;
return ret; return 0;
} }
static int au_read_close(AVFormatContext *s) static int au_read_close(AVFormatContext *s)

8
libav/wav.c
View File

@ -267,15 +267,11 @@ static int wav_read_header(AVFormatContext *s,
static int wav_read_packet(AVFormatContext *s, static int wav_read_packet(AVFormatContext *s,
AVPacket *pkt) AVPacket *pkt)
{ {
int packet_size, n, ret; int ret;
if (url_feof(&s->pb)) if (url_feof(&s->pb))
return -EIO; return -EIO;
packet_size = url_get_packet_size(&s->pb); if (av_new_packet(pkt, MAX_SIZE))
n = MAX_SIZE / packet_size;
if (n <= 0)
return n = 1;
if (av_new_packet(pkt, n * packet_size))
return -EIO; return -EIO;
pkt->stream_index = 0; pkt->stream_index = 0;