[FFmpeg-cvslog] hls: Copy the time base from the chained demuxer

Michael Niedermayer git at videolan.org
Mon Jul 29 14:08:47 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  7 13:42:12 2013 +0100| [82bf8c878345b6178ba32c7270a86670a92a72c2] | committer: Martin Storsjö

hls: Copy the time base from the chained demuxer

When a variant stream isn't mpegts but e.g. raw adts, the
default time base (90k) isn't correct.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82bf8c878345b6178ba32c7270a86670a92a72c2
---

 libavformat/hls.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 464faee..b9b1fea 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -530,11 +530,13 @@ static int hls_read_header(AVFormatContext *s)
         /* Create new AVStreams for each stream in this variant */
         for (j = 0; j < v->ctx->nb_streams; j++) {
             AVStream *st = avformat_new_stream(s, NULL);
+            AVStream *ist = v->ctx->streams[j];
             if (!st) {
                 ret = AVERROR(ENOMEM);
                 goto fail;
             }
             st->id = i;
+            avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den);
             avcodec_copy_context(st->codec, v->ctx->streams[j]->codec);
             if (v->bandwidth)
                 av_dict_set(&st->metadata, "variant_bitrate", bitrate_str,



More information about the ffmpeg-cvslog mailing list