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

oggdec: Initialize stream index to -1 in ogg_packet.

Browse Source 
The previous method of having to initialize it outside lead
to incorrect code: even if it was initialized, it usually was
only initialized once, thus a packet that could not be matched
to any stream would just be processed with the return values
from the previous call.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 69aeba1396d5a13e79cbc3cc9f49fd6896addb82)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Reimar Döffinger 2012-08-05 09:45:04 +02:00 committed by Michael Niedermayer
parent 5231a35559
commit fb52da522c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/oggdec.c
View File

@ -336,6 +336,13 @@ static int ogg_read_page(AVFormatContext *s, int *str)
return 0;
}
/**
* @brief find the next Ogg packet
* @param *str is set to the stream for the packet or -1 if there is
* no matching stream, in that case assume all other return
* values to be uninitialized.
* @return negative value on error or EOF.
*/
static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
int64_t *fpos)
{
@ -346,6 +353,8 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
int segp = 0, psize = 0;
av_dlog(s, "ogg_packet: curidx=%i\n", ogg->curidx);
if (str)
*str = -1;
do{
idx = ogg->curidx;
@ -524,7 +533,6 @@ static int ogg_get_length(AVFormatContext *s)
ogg_save (s);
avio_seek (s->pb, s->data_offset, SEEK_SET);
ogg_reset(s);
i = -1;
while (streams_left > 0 && !ogg_packet(s, &i, NULL, NULL, NULL)) {
int64_t pts;
if (i < 0) continue;
@ -611,7 +619,7 @@ static int ogg_read_packet(AVFormatContext *s, AVPacket *pkt)
{
struct ogg *ogg;
struct ogg_stream *os;
int idx = -1, ret;
int idx, ret;
int pstart, psize;
int64_t fpos, pts, dts;
@ -670,7 +678,7 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
AVIOContext *bc = s->pb;
int64_t pts = AV_NOPTS_VALUE;
int64_t keypos = -1;
int i = -1;
int i;
int pstart, psize;
avio_seek(bc, *pos_arg, SEEK_SET);
ogg_reset(s);