[SCM] libav/experimental: partially revert r2931 (Support raw mpegts streams from dvr) the change was wrong
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:01:04 UTC 2013
The following commit has been merged in the experimental branch:
commit e39291dfcf08fc7108efc95287bf2db13829cab5
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Jun 4 22:23:05 2007 +0000
partially revert r2931 (Support raw mpegts streams from dvr)
the change was wrong
Originally committed as revision 9219 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 7829c7f..9063df6 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1155,13 +1155,6 @@ static int mpegts_read_header(AVFormatContext *s,
url_fseek(pb, pos, SEEK_SET);
mpegts_scan_sdt(ts);
- if (ts->nb_services <= 0 && 0) {
- /* raw transport stream */
- ts->auto_guess = 1;
- s->ctx_flags |= AVFMTCTX_NOHEADER;
- goto do_pcr;
- }
-
mpegts_set_service(ts);
handle_packets(ts, s->probesize);
@@ -1182,7 +1175,6 @@ static int mpegts_read_header(AVFormatContext *s,
/* only read packets */
- do_pcr:
st = av_new_stream(s, 0);
if (!st)
goto fail;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list