diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-28 13:36:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-02 03:12:25 +0100 |
| commit | 3250d4b39ccf70a9517a708fb6738070ebe83d6a (patch) | |
| tree | 552306482c6590ffef79dc0f0cf881e46ad1d3d3 | |
| parent | 70ebc05bce51215cd0857194d6cabf1e4d1440fb (diff) | |
| download | ffmpeg-3250d4b39ccf70a9517a708fb6738070ebe83d6a.tar.gz | |
avformat/oggdec: remove unused parameter of ogg_restore()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/oggdec.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index e1ef21337c..64a88261e3 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -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 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 static int ogg_save(AVFormatContext *s) @@ -95,12 +95,12 @@ static int ogg_save(AVFormatContext *s) ogg->state = ost; if (ret < 0) - ogg_restore(s, 0); + ogg_restore(s); return ret; } -static int ogg_restore(AVFormatContext *s, int discard) +static int ogg_restore(AVFormatContext *s) { struct ogg *ogg = s->priv_data; AVIOContext *bc = s->pb; @@ -112,8 +112,6 @@ static int ogg_restore(AVFormatContext *s, int discard) ogg->state = ost->next; - if (!discard) { - for (i = 0; i < ogg->nstreams; i++) av_freep(&ogg->streams[i].buf); @@ -128,7 +126,6 @@ static int ogg_restore(AVFormatContext *s, int discard) } else memcpy(ogg->streams, ost->streams, ost->nstreams * sizeof(*ogg->streams)); - } 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); if (ret < 0) @@ -654,7 +651,7 @@ static int ogg_get_length(AVFormatContext *s) streams_left--; } } - ogg_restore (s, 0); + ogg_restore (s); return 0; } |