Commit 9cb3dd78 authored by nicodvb's avatar nicodvb

try with auto_guess if first detection fails


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4802 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9301df13
...@@ -1183,6 +1183,7 @@ static int mpegts_read_header(AVFormatContext *s, ...@@ -1183,6 +1183,7 @@ 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 (!ts->mpeg2ts_raw) { if (!ts->mpeg2ts_raw) {
/* normal demux */ /* normal demux */
...@@ -1235,8 +1236,15 @@ static int mpegts_read_header(AVFormatContext *s, ...@@ -1235,8 +1236,15 @@ static int mpegts_read_header(AVFormatContext *s,
} }
/* 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
printf("tuning done\n"); printf("tuning done\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment