Commit 725c10c5 authored by michael's avatar michael

Move set_codec_from_probe_data() up to where the other probe functions are.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14180 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 403b9015
......@@ -293,6 +293,20 @@ AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened){
return av_probe_input_format2(pd, is_opened, &score);
}
static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
{
AVInputFormat *fmt;
fmt = av_probe_input_format2(pd, 1, &score);
if (fmt) {
if (strncmp(fmt->name, "mp3", 3) == 0)
st->codec->codec_id = CODEC_ID_MP3;
else if (strncmp(fmt->name, "ac3", 3) == 0)
st->codec->codec_id = CODEC_ID_AC3;
}
return !!fmt;
}
/************************************************************/
/* input media file */
......@@ -1785,20 +1799,6 @@ static int try_decode_frame(AVStream *st, const uint8_t *data, int size)
return ret;
}
static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
{
AVInputFormat *fmt;
fmt = av_probe_input_format2(pd, 1, &score);
if (fmt) {
if (strncmp(fmt->name, "mp3", 3) == 0)
st->codec->codec_id = CODEC_ID_MP3;
else if (strncmp(fmt->name, "ac3", 3) == 0)
st->codec->codec_id = CODEC_ID_AC3;
}
return !!fmt;
}
unsigned int codec_get_tag(const AVCodecTag *tags, int id)
{
while (tags->id != CODEC_ID_NONE) {
......
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