RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-31 03:44:15 +00:00
Code Issues Projects Releases Wiki Activity

avformat/utils: Use st for AVStream variable in avpriv_set_pts_info

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-09 17:08:49 +02:00
parent f5bfc11b5d
commit 6af21de373
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/internal.h
View File

@ -696,13 +696,13 @@ int64_t ff_gen_search(AVFormatContext *s, int stream_index,
* (numerator or denominator are non-positive), it leaves the stream * (numerator or denominator are non-positive), it leaves the stream
* unchanged. * unchanged.
* *
* @param s stream * @param st stream
* @param pts_wrap_bits number of bits effectively used by the pts * @param pts_wrap_bits number of bits effectively used by the pts
* (used for wrap control) * (used for wrap control)
* @param pts_num time base numerator * @param pts_num time base numerator
* @param pts_den time base denominator * @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); unsigned int pts_num, unsigned int pts_den);
/** /**

14
libavformat/utils.c
View File

@ -1143,30 +1143,30 @@ int ff_hex_to_data(uint8_t *data, const char *p)
return len; 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) unsigned int pts_num, unsigned int pts_den)
{ {
FFStream *const sti = ffstream(s); FFStream *const sti = ffstream(st);
AVRational new_tb; AVRational new_tb;
if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) { if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) {
if (new_tb.num != pts_num) if (new_tb.num != pts_num)
av_log(NULL, AV_LOG_DEBUG, av_log(NULL, AV_LOG_DEBUG,
"st:%d removing common factor %d from timebase\n", "st:%d removing common factor %d from timebase\n",
s->index, pts_num / new_tb.num); st->index, pts_num / new_tb.num);
} else } else
av_log(NULL, AV_LOG_WARNING, 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) { if (new_tb.num <= 0 || new_tb.den <= 0) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Ignoring attempt to set invalid timebase %d/%d for st:%d\n", "Ignoring attempt to set invalid timebase %d/%d for st:%d\n",
new_tb.num, new_tb.den, new_tb.num, new_tb.den,
s->index); st->index);
return; return;
} }
s->time_base = new_tb; st->time_base = new_tb;
sti->avctx->pkt_timebase = 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, void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,