[FFmpeg-cvslog] hls: Set stream offset before opening a chained demuxer

Martin Storsjö git at videolan.org
Mon Jul 29 14:15:02 CEST 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Jul 28 20:33:26 2013 +0300| [c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622] | committer: Martin Storsjö

hls: Set stream offset before opening a chained demuxer

This makes sure we don't accidentally check discard flags
for the wrong stream.

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

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

 libavformat/hls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 213b717..86cf974 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -523,10 +523,10 @@ static int hls_read_header(AVFormatContext *s)
             goto fail;
         }
         v->ctx->pb       = &v->pb;
+        v->stream_offset = stream_offset;
         ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL);
         if (ret < 0)
             goto fail;
-        v->stream_offset = stream_offset;
         snprintf(bitrate_str, sizeof(bitrate_str), "%d", v->bandwidth);
         /* Create new AVStreams for each stream in this variant */
         for (j = 0; j < v->ctx->nb_streams; j++) {



More information about the ffmpeg-cvslog mailing list