wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lavf/oggdec: inline ogg_get_headers().

Browse source 
There is no point in a distant definition of a small function like this
used only once.

Additional spacing to distinguish better the block.
This commit is contained in:
Clément Bœsch 2012-09-14 23:05:57 +02:00
parent 6fa2532dd3
commit bf8bfc6a11
1 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libavformat/oggdec.c
View file

@ -475,22 +475,6 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
return 0;
}
static int ogg_get_headers(AVFormatContext *s)
{
struct ogg *ogg = s->priv_data;
int ret;
do{
ret = ogg_packet(s, NULL, NULL, NULL, NULL);
if (ret < 0)
return ret;
}while (!ogg->headers);
av_dlog(s, "found headers\n");
return 0;
}
static int ogg_get_length(AVFormatContext *s)
{
struct ogg *ogg = s->priv_data;
@ -556,11 +540,16 @@ static int ogg_read_header(AVFormatContext *s)
{
struct ogg *ogg = s->priv_data;
int ret, i;
ogg->curidx = -1;
//linear headers seek from start
ret = ogg_get_headers(s);
if (ret < 0)
return ret;
do {
ret = ogg_packet(s, NULL, NULL, NULL, NULL);
if (ret < 0)
return ret;
} while (!ogg->headers);
av_dlog(s, "found headers\n");
for (i = 0; i < ogg->nstreams; i++)
if (ogg->streams[i].header < 0)