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

Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622' 

* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
  hls: Set stream offset before opening a chained demuxer

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-29 14:11:21 +02:00
parent d31c0fcfa5 c11e33a3d9
commit 2f9e97b32a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/hls.c
View File

@ -572,11 +572,10 @@ static int hls_read_header(AVFormatContext *s)
goto fail; goto fail;
} }
v->ctx->pb = &v->pb; v->ctx->pb = &v->pb;
v->stream_offset = stream_offset;
ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL); ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
v->stream_offset = stream_offset;
v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER; v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER;
ret = avformat_find_stream_info(v->ctx, NULL); ret = avformat_find_stream_info(v->ctx, NULL);
if (ret < 0) if (ret < 0)