virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'

Browse Source 
* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
  hls: Store first_timestamp in units of AV_TIME_BASE

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-30 10:03:02 +02:00
parent 947f2d4d34 e1d5b24476
commit 5a270296cb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/hls.c
View File

@@ -679,8 +679,11 @@ start:
reset_packet(&var->pkt); reset_packet(&var->pkt);
break; break;
} else { } else {
if (c->first_timestamp == AV_NOPTS_VALUE) if (c->first_timestamp == AV_NOPTS_VALUE &&
c->first_timestamp = var->pkt.dts; var->pkt.dts != AV_NOPTS_VALUE)
c->first_timestamp = av_rescale_q(var->pkt.dts,
var->ctx->streams[var->pkt.stream_index]->time_base,
AV_TIME_BASE_Q);
} }
if (c->seek_timestamp == AV_NOPTS_VALUE) if (c->seek_timestamp == AV_NOPTS_VALUE)
@@ -780,10 +783,8 @@ static int hls_read_seek(AVFormatContext *s, int stream_index,
/* Reset reading */ /* Reset reading */
struct variant *var = c->variants[i]; struct variant *var = c->variants[i];
int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ? 0 : int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ? 0 :
av_rescale_rnd(c->first_timestamp, 1, stream_index >= 0 ? av_rescale_rnd(c->first_timestamp, 1, AV_TIME_BASE,
s->streams[stream_index]->time_base.den : flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
AV_TIME_BASE, flags & AVSEEK_FLAG_BACKWARD ?
AV_ROUND_DOWN : AV_ROUND_UP);
if (var->input) { if (var->input) {
ffurl_close(var->input); ffurl_close(var->input);
var->input = NULL; var->input = NULL;