virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

revert r4802 (try with auto_guess if first detection fails)

Browse Source 
this change is broken, 3/4 of the code added is unreachable, ill implement
it correctly in a moment

Originally committed as revision 9174 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-06-02 21:44:20 +00:00
parent 38c48be213
commit d287b04b6d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mpegts.c
View File

@@ -1221,7 +1221,6 @@ static int mpegts_read_header(AVFormatContext *s,
ts->stream = s; ts->stream = s;
ts->auto_guess = 0; ts->auto_guess = 0;
goto_auto_guess:
if (s->iformat == &mpegts_demuxer) { if (s->iformat == &mpegts_demuxer) {
/* normal demux */ /* normal demux */
@@ -1274,15 +1273,8 @@ goto_auto_guess:
} }
/* if could not find service, exit */ /* if could not find service, exit */
if (ts->set_service_ret != 0) { if (ts->set_service_ret != 0)
if(ts->auto_guess) return -1;
return -1;
else {
//let's retry with auto_guess set
ts->auto_guess = 1;
goto goto_auto_guess;
}
}
#ifdef DEBUG_SI #ifdef DEBUG_SI
av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n"); av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");