[SCM] libav/experimental: correct implementation of "try with auto_guess if first detection fails" (untested)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:00:48 UTC 2013


The following commit has been merged in the experimental branch:
commit 165f503a2782240405bad06ad5678f64afbc2a2d
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jun 2 21:48:49 2007 +0000

    correct implementation of "try with auto_guess if first detection fails"
    (untested)
    
    Originally committed as revision 9175 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index be431b1..3584234 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1271,10 +1271,10 @@ static int mpegts_read_header(AVFormatContext *s,
 
                 handle_packets(ts, s->probesize);
             }
-            /* if could not find service, exit */
+            /* if could not find service, enable auto_guess */
 
             if (ts->set_service_ret != 0)
-                return -1;
+                ts->auto_guess = 1;
 
 #ifdef DEBUG_SI
             av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list