[FFmpeg-cvslog] Assume some TS packet size instead of failing completely.

Reimar Döffinger git at videolan.org
Sat May 7 17:39:17 CEST 2011


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Apr 24 17:33:48 2011 +0200| [90f5e991be3a28a2caa06132d995c0daef911a56] | committer: Reimar Döffinger

Assume some TS packet size instead of failing completely.

Fixes ticket #68.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90f5e991be3a28a2caa06132d995c0daef911a56
---

 libavformat/mpegts.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 665c92a..caef69d 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1468,8 +1468,10 @@ static int mpegts_read_header(AVFormatContext *s,
     if (len != sizeof(buf))
         goto fail;
     ts->raw_packet_size = get_packet_size(buf, sizeof(buf));
-    if (ts->raw_packet_size <= 0)
-        goto fail;
+    if (ts->raw_packet_size <= 0) {
+        av_log(s, AV_LOG_WARNING, "Could not detect TS packet size, defaulting to non-FEC/DVHS\n");
+        ts->raw_packet_size = TS_PACKET_SIZE;
+    }
     ts->stream = s;
     ts->auto_guess = 0;
 



More information about the ffmpeg-cvslog mailing list