har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/oggdec: remove unused parameter of ogg_restore()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-02-28 13:36:29 +01:00
parent 70ebc05bce
commit 3250d4b39c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/oggdec.c
View File

@ -61,7 +61,7 @@ static const struct ogg_codec * const ogg_codecs[] = {
static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts); static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts);
static int ogg_new_stream(AVFormatContext *s, uint32_t serial); static int ogg_new_stream(AVFormatContext *s, uint32_t serial);
static int ogg_restore(AVFormatContext *s, int discard); static int ogg_restore(AVFormatContext *s);
//FIXME We could avoid some structure duplication //FIXME We could avoid some structure duplication
static int ogg_save(AVFormatContext *s) static int ogg_save(AVFormatContext *s)
@ -95,12 +95,12 @@ static int ogg_save(AVFormatContext *s)
ogg->state = ost; ogg->state = ost;
if (ret < 0) if (ret < 0)
ogg_restore(s, 0); ogg_restore(s);
return ret; return ret;
} }
static int ogg_restore(AVFormatContext *s, int discard) static int ogg_restore(AVFormatContext *s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
@ -112,8 +112,6 @@ static int ogg_restore(AVFormatContext *s, int discard)
ogg->state = ost->next; ogg->state = ost->next;
if (!discard) {
for (i = 0; i < ogg->nstreams; i++) for (i = 0; i < ogg->nstreams; i++)
av_freep(&ogg->streams[i].buf); av_freep(&ogg->streams[i].buf);
@ -128,7 +126,6 @@ static int ogg_restore(AVFormatContext *s, int discard)
} else } else
memcpy(ogg->streams, ost->streams, memcpy(ogg->streams, ost->streams,
ost->nstreams * sizeof(*ogg->streams)); ost->nstreams * sizeof(*ogg->streams));
}
av_free(ost); av_free(ost);
@ -631,7 +628,7 @@ static int ogg_get_length(AVFormatContext *s)
} }
} }
ogg_restore(s, 0); ogg_restore(s);
ret = ogg_save(s); ret = ogg_save(s);
if (ret < 0) if (ret < 0)
@ -654,7 +651,7 @@ static int ogg_get_length(AVFormatContext *s)
streams_left--; streams_left--;
} }
} }
ogg_restore (s, 0); ogg_restore (s);
return 0; return 0;
} }