diff options
| author | Joakim Plate <elupus@ecce.se> | 2013-12-14 12:13:17 +0100 |
|---|---|---|
| committer | Joakim Plate <elupus@ecce.se> | 2013-12-14 12:13:17 +0100 |
| commit | d929efd05bd4c4c690131e5644617d2ac32e8d73 (patch) | |
| tree | 4fb8a7a77b49d3e87b40e0cfdcd639a0cf3bfdf8 | |
| parent | 7f6c5e4ee4c86602677add662380eb4813cc6f69 (diff) | |
mpegts: revert old change for NOHEADER, we will handle it on PMT instead
| -rw-r--r-- | lib/ffmpeg/libavformat/mpegts.c | 5 | ||||
| -rw-r--r-- | lib/ffmpeg/patches/0016-Speed-up-mpegts-av_find_stream_info.patch | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/lib/ffmpeg/libavformat/mpegts.c b/lib/ffmpeg/libavformat/mpegts.c index 4f2568667e..9b9c47ef85 100644 --- a/lib/ffmpeg/libavformat/mpegts.c +++ b/lib/ffmpeg/libavformat/mpegts.c @@ -2101,10 +2101,7 @@ static int mpegts_read_header(AVFormatContext *s) av_dlog(ts->stream, "tuning done\n"); - /* only flag NOHEADER if we are in file mode, - in streaming mode scanning may take too long for users */ - if (pb->seekable) - s->ctx_flags |= AVFMTCTX_NOHEADER; + s->ctx_flags |= AVFMTCTX_NOHEADER; } else { AVStream *st; int pcr_pid, pid, nb_packets, nb_pcrs, ret, pcr_l; diff --git a/lib/ffmpeg/patches/0016-Speed-up-mpegts-av_find_stream_info.patch b/lib/ffmpeg/patches/0016-Speed-up-mpegts-av_find_stream_info.patch index 9281558b46..93dafee820 100644 --- a/lib/ffmpeg/patches/0016-Speed-up-mpegts-av_find_stream_info.patch +++ b/lib/ffmpeg/patches/0016-Speed-up-mpegts-av_find_stream_info.patch @@ -20,18 +20,6 @@ index c374cb9..6da6db5 100644 pes->st = avformat_new_stream(ts->stream, NULL); if (!pes->st) return AVERROR(ENOMEM); -@@ -2013,7 +2013,10 @@ static int mpegts_read_header(AVFormatContext *s, - - av_dlog(ts->stream, "tuning done\n"); - -- s->ctx_flags |= AVFMTCTX_NOHEADER; -+ /* only flag NOHEADER if we are in file mode, -+ in streaming mode scanning may take too long for users */ -+ if (pb->seekable) -+ s->ctx_flags |= AVFMTCTX_NOHEADER; - } else { - AVStream *st; - int pcr_pid, pid, nb_packets, nb_pcrs, ret, pcr_l; -- 1.7.9.4 |