This fixes probing dts/eac3/mp2 in hls.
This partly reverts commit 04964ac311abe670fb3b60290a330f2067544b13.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
libavformat/hls.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 3c09dd8..2364144 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1750,17 +1750,9 @@ static int hls_read_header(AVFormatContext *s)
if (pls->is_id3_timestamped == -1)
av_log(s, AV_LOG_WARNING, "No expected HTTP requests have been
made\n");
- /*
- * For ID3 timestamped raw audio streams we need to detect the packet
- * durations to calculate timestamps in
fill_timing_for_id3_timestamped_stream(),
- * but for other streams we can rely on our user calling
avformat_find_stream_info()
- * on us if they want to.
- */
- if (pls->is_id3_timestamped) {
- ret = avformat_find_stream_info(pls->ctx, NULL);
- if (ret < 0)
- goto fail;
- }
+ ret = avformat_find_stream_info(pls->ctx, NULL);
+ if (ret < 0)
+ goto fail;
pls->has_noheader_flag = !!(pls->ctx->ctx_flags & AVFMTCTX_NOHEADER);
--
2.9.3
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
