diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-09-14 23:10:38 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-09-16 16:52:06 +0200 |
| commit | 277ddf127dc4c24d7178ff2e9a909e009fe112a4 (patch) | |
| tree | 6d3ed9a9e94fee1ead31457842133afc3beeb238 /libavformat/oggdec.c | |
| parent | e1ca1dd71bd190187fa69b4c71dca5fee0666ba9 (diff) | |
lavf/oggdec: rename str to sid.
"str" is misleading here (it's often used for string). "sid" makes more
sense to identify a stream id.
Diffstat (limited to 'libavformat/oggdec.c')
| -rw-r--r-- | libavformat/oggdec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 4cffe0f9ea..9d27393339 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -206,7 +206,7 @@ static int ogg_new_buf(struct ogg *ogg, int idx) return 0; } -static int ogg_read_page(AVFormatContext *s, int *str) +static int ogg_read_page(AVFormatContext *s, int *sid) { AVIOContext *bc = s->pb; struct ogg *ogg = s->priv_data; @@ -331,20 +331,20 @@ static int ogg_read_page(AVFormatContext *s, int *str) os->flags = flags; memset(os->buf + os->bufpos, 0, FF_INPUT_BUFFER_PADDING_SIZE); - if (str) - *str = idx; + if (sid) + *sid = idx; return 0; } /** * @brief find the next Ogg packet - * @param *str is set to the stream for the packet or -1 if there is + * @param *sid 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, +static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, int64_t *fpos) { struct ogg *ogg = s->priv_data; @@ -354,8 +354,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; + if (sid) + *sid = -1; do{ idx = ogg->curidx; @@ -445,8 +445,8 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize, os->pduration = 0; if (os->codec && os->codec->packet) os->codec->packet (s, idx); - if (str) - *str = idx; + if (sid) + *sid = idx; if (dstart) *dstart = os->pstart; if (dsize) |