highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make av_set_pts_info keep previous time base if new one is invalid.

Browse Source 
Fixes issue 2475.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Reimar Döffinger
2011-02-06 15:27:30 +01:00
committed by Ronald S. Bultje
parent a351110eea
commit b3190529df
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avformat.h
View File

@@ -1265,7 +1265,8 @@ AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
int64_t start, int64_t end, const char *title); int64_t start, int64_t end, const char *title);
/** /**
* Set the pts for a given stream. * Set the pts for a given stream. If the new values would be invalid
* (<= 0), it leaves the AVStream unchanged.
* *
* @param s stream * @param s 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

17
libavformat/utils.c
View File

@@ -3762,16 +3762,19 @@ int ff_hex_to_data(uint8_t *data, const char *p)
void av_set_pts_info(AVStream *s, int pts_wrap_bits, void av_set_pts_info(AVStream *s, int pts_wrap_bits,
unsigned int pts_num, unsigned int pts_den) unsigned int pts_num, unsigned int pts_den)
{ {
s->pts_wrap_bits = pts_wrap_bits; AVRational new_tb;
if(av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)){
if(av_reduce(&s->time_base.num, &s->time_base.den, pts_num, pts_den, INT_MAX)){ if(new_tb.num != pts_num)
if(s->time_base.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);
av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, pts_num/s->time_base.num);
}else }else
av_log(NULL, AV_LOG_WARNING, "st:%d has too large timebase, reducing\n", s->index); av_log(NULL, AV_LOG_WARNING, "st:%d has too large timebase, reducing\n", s->index);
if(!s->time_base.num || !s->time_base.den) if(new_tb.num <= 0 || new_tb.den <= 0) {
s->time_base.num= s->time_base.den= 0; av_log(NULL, AV_LOG_ERROR, "Ignoring attempt to set invalid timebase for st:%d\n", s->index);
return;
}
s->time_base = new_tb;
s->pts_wrap_bits = pts_wrap_bits;
} }
int ff_url_join(char *str, int size, const char *proto, int ff_url_join(char *str, int size, const char *proto,