aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-26 02:52:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-26 03:05:31 +0200
commit6f6182372ccac3f29ce29637a27ef8a2833619a7 (patch)
tree5ab9526cb21a7e4f8804ce834432e6297feb8a1f /libavformat
parent12d1ee6a5e30a4427e2c7571230296b5e266952e (diff)
downloadffmpeg-6f6182372ccac3f29ce29637a27ef8a2833619a7.tar.gz
hls: replace probsize=0 by noheader flag removial.
This fixes h264 timestamps in hls Fixes ticket1572 Tested-by: crtmpserver Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/hls.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 08df96a01e..9d4a2bc39f 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -528,7 +528,8 @@ static int hls_read_header(AVFormatContext *s)
ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL);
if (ret < 0)
goto fail;
- v->ctx->probesize = 0;
+
+ v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER;
ret = avformat_find_stream_info(v->ctx, NULL);
if (ret < 0)
goto fail;