generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-07 12:16:49 +02:00
parent 7c73d21523 ef17a0c7ba
commit 4c404611da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/utils.c
View File

@@ -278,11 +278,11 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
if (!strcmp(fmt->name, fmt_id_type[i].name)) { if (!strcmp(fmt->name, fmt_id_type[i].name)) {
st->codec->codec_id = fmt_id_type[i].id; st->codec->codec_id = fmt_id_type[i].id;
st->codec->codec_type = fmt_id_type[i].type; st->codec->codec_type = fmt_id_type[i].type;
break;
}
}
}
return score; return score;
}
}
}
return 0;
} }
/************************************************************/ /************************************************************/