diff --git a/libavformat/internal.h b/libavformat/internal.h index d14dee5422..cc8c8f4b43 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -696,13 +696,13 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index, * (numerator or denominator are non-positive), it leaves the stream * unchanged. * - * @param s stream + * @param st stream * @param pts_wrap_bits number of bits effectively used by the pts * (used for wrap control) * @param pts_num time base numerator * @param pts_den time base denominator */ -void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits, +void avpriv_set_pts_info(AVStream *st, int pts_wrap_bits, unsigned int pts_num, unsigned int pts_den); /** diff --git a/libavformat/utils.c b/libavformat/utils.c index b0814d7bc2..3e6b6a1e23 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1143,30 +1143,30 @@ int ff_hex_to_data(uint8_t *data, const char *p) return len; } -void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits, +void avpriv_set_pts_info(AVStream *st, int pts_wrap_bits, unsigned int pts_num, unsigned int pts_den) { - FFStream *const sti = ffstream(s); + FFStream *const sti = ffstream(st); AVRational new_tb; if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) { if (new_tb.num != pts_num) av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", - s->index, pts_num / new_tb.num); + st->index, pts_num / new_tb.num); } else av_log(NULL, AV_LOG_WARNING, - "st:%d has too large timebase, reducing\n", s->index); + "st:%d has too large timebase, reducing\n", st->index); if (new_tb.num <= 0 || new_tb.den <= 0) { av_log(NULL, AV_LOG_ERROR, "Ignoring attempt to set invalid timebase %d/%d for st:%d\n", new_tb.num, new_tb.den, - s->index); + st->index); return; } - s->time_base = new_tb; + st->time_base = new_tb; sti->avctx->pkt_timebase = new_tb; - s->pts_wrap_bits = pts_wrap_bits; + st->pts_wrap_bits = pts_wrap_bits; } void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,