RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9b1370aced385698bc783747917544ab69ecb373' 

* commit '9b1370aced385698bc783747917544ab69ecb373':
  hlsenc: do not add timestamps in different timebases
  hlsenc: use the correct AV_TIME_BASE macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-30 14:11:11 +01:00
parent 19e1c8e4f2 9b1370aced
commit 56c71cd599
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/hlsenc.c
View File

@ -189,7 +189,7 @@ static int hls_write_header(AVFormatContext *s)
hls->number = 0;
hls->recording_time = hls->time * 1000000;
hls->recording_time = hls->time * AV_TIME_BASE;
hls->start_pts = AV_NOPTS_VALUE;
for (i = 0; i < s->nb_streams; i++)
@ -255,10 +255,10 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
hls->start_pts = pkt->pts;
hls->end_pts = pkt->pts;
}
end_pts += hls->start_pts;
if ((hls->has_video && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
av_compare_ts(pkt->pts, st->time_base, end_pts, AV_TIME_BASE_Q) >= 0 &&
av_compare_ts(pkt->pts - hls->start_pts, st->time_base,
end_pts, AV_TIME_BASE_Q) >= 0 &&
pkt->flags & AV_PKT_FLAG_KEY) {
ret = append_entry(hls, av_rescale(pkt->pts - hls->end_pts,