Skip to content

F
ffmpeg.wasm-core
Commit e575685f authored by Clément Bœsch's avatar Clément Bœsch Committed by Diego Biurrun
Browse files
Options

Cosmetics: fix prototypes in oggdec 

Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent 5780f41a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 33 deletions
libavformat/oggdec.c
View file @ e575685f
...@@ -55,8 +55,7 @@ static const struct ogg_codec * const ogg_codecs[] = { ...@@ -55,8 +55,7 @@ static const struct ogg_codec * const ogg_codecs[] = {
}; };
//FIXME We could avoid some structure duplication //FIXME We could avoid some structure duplication
static int static int ogg_save(AVFormatContext *s)
ogg_save (AVFormatContext * s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
struct ogg_state *ost = struct ogg_state *ost =
...@@ -80,8 +79,7 @@ ogg_save (AVFormatContext * s) ...@@ -80,8 +79,7 @@ ogg_save (AVFormatContext * s)
return 0; return 0;
} }
static int static int ogg_restore(AVFormatContext *s, int discard)
ogg_restore (AVFormatContext * s, int discard)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
...@@ -109,8 +107,7 @@ ogg_restore (AVFormatContext * s, int discard) ...@@ -109,8 +107,7 @@ ogg_restore (AVFormatContext * s, int discard)
return 0; return 0;
} }
static int static int ogg_reset(struct ogg *ogg)
ogg_reset (struct ogg * ogg)
{ {
int i; int i;
...@@ -134,8 +131,7 @@ ogg_reset (struct ogg * ogg) ...@@ -134,8 +131,7 @@ ogg_reset (struct ogg * ogg)
return 0; return 0;
} }
static const struct ogg_codec * static const struct ogg_codec *ogg_find_codec(uint8_t *buf, int size)
ogg_find_codec (uint8_t * buf, int size)
{ {
int i; int i;
...@@ -147,8 +143,7 @@ ogg_find_codec (uint8_t * buf, int size) ...@@ -147,8 +143,7 @@ ogg_find_codec (uint8_t * buf, int size)
return NULL; return NULL;
} }
static int static int ogg_new_stream(AVFormatContext *s, uint32_t serial, int new_avstream)
ogg_new_stream (AVFormatContext *s, uint32_t serial, int new_avstream)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
...@@ -176,8 +171,7 @@ ogg_new_stream (AVFormatContext *s, uint32_t serial, int new_avstream) ...@@ -176,8 +171,7 @@ ogg_new_stream (AVFormatContext *s, uint32_t serial, int new_avstream)
return idx; return idx;
} }
static int static int ogg_new_buf(struct ogg *ogg, int idx)
ogg_new_buf(struct ogg *ogg, int idx)
{ {
struct ogg_stream *os = ogg->streams + idx; struct ogg_stream *os = ogg->streams + idx;
uint8_t *nb = av_malloc(os->bufsize); uint8_t *nb = av_malloc(os->bufsize);
...@@ -193,8 +187,7 @@ ogg_new_buf(struct ogg *ogg, int idx) ...@@ -193,8 +187,7 @@ ogg_new_buf(struct ogg *ogg, int idx)
return 0; return 0;
} }
static int static int ogg_read_page(AVFormatContext *s, int *str)
ogg_read_page (AVFormatContext * s, int *str)
{ {
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
...@@ -311,8 +304,8 @@ ogg_read_page (AVFormatContext * s, int *str) ...@@ -311,8 +304,8 @@ ogg_read_page (AVFormatContext * s, int *str)
return 0; return 0;
} }
static int static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpos) int64_t *fpos)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int idx, i; int idx, i;
...@@ -439,8 +432,7 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo ...@@ -439,8 +432,7 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo
return 0; return 0;
} }
static int static int ogg_get_headers(AVFormatContext *s)
ogg_get_headers (AVFormatContext * s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
...@@ -454,8 +446,7 @@ ogg_get_headers (AVFormatContext * s) ...@@ -454,8 +446,7 @@ ogg_get_headers (AVFormatContext * s)
return 0; return 0;
} }
static int static int ogg_get_length(AVFormatContext *s)
ogg_get_length (AVFormatContext * s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int i; int i;
...@@ -491,9 +482,7 @@ ogg_get_length (AVFormatContext * s) ...@@ -491,9 +482,7 @@ ogg_get_length (AVFormatContext * s)
return 0; return 0;
} }
static int ogg_read_header(AVFormatContext *s, AVFormatParameters *ap)
static int
ogg_read_header (AVFormatContext * s, AVFormatParameters * ap)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int i; int i;
...@@ -544,8 +533,7 @@ static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts) ...@@ -544,8 +533,7 @@ static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts)
return pts; return pts;
} }
static int static int ogg_read_packet(AVFormatContext *s, AVPacket *pkt)
ogg_read_packet (AVFormatContext * s, AVPacket * pkt)
{ {
struct ogg *ogg; struct ogg *ogg;
struct ogg_stream *os; struct ogg_stream *os;
...@@ -585,9 +573,7 @@ retry: ...@@ -585,9 +573,7 @@ retry:
return psize; return psize;
} }
static int ogg_read_close(AVFormatContext *s)
static int
ogg_read_close (AVFormatContext * s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int i; int i;
...@@ -600,10 +586,8 @@ ogg_read_close (AVFormatContext * s) ...@@ -600,10 +586,8 @@ ogg_read_close (AVFormatContext * s)
return 0; return 0;
} }
static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
static int64_t int64_t *pos_arg, int64_t pos_limit)
ogg_read_timestamp (AVFormatContext * s, int stream_index, int64_t * pos_arg,
int64_t pos_limit)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + stream_index; struct ogg_stream *os = ogg->streams + stream_index;
...@@ -626,7 +610,8 @@ ogg_read_timestamp (AVFormatContext * s, int stream_index, int64_t * pos_arg, ...@@ -626,7 +610,8 @@ ogg_read_timestamp (AVFormatContext * s, int stream_index, int64_t * pos_arg,
return pts; return pts;
} }
static int ogg_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) static int ogg_read_seek(AVFormatContext *s, int stream_index,
int64_t timestamp, int flags)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + stream_index; struct ogg_stream *os = ogg->streams + stream_index;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment