Commit c982f5c0 authored by andoma's avatar andoma

When setting codec_id during codec probe we must also set codec_type.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14966 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b4eedcd1
......@@ -352,14 +352,19 @@ static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score)
fmt = av_probe_input_format2(pd, 1, &score);
if (fmt) {
if (!strcmp(fmt->name, "mp3"))
if (!strcmp(fmt->name, "mp3")) {
st->codec->codec_id = CODEC_ID_MP3;
else if (!strcmp(fmt->name, "ac3"))
st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if (!strcmp(fmt->name, "ac3")) {
st->codec->codec_id = CODEC_ID_AC3;
else if (!strcmp(fmt->name, "mpegvideo"))
st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if (!strcmp(fmt->name, "mpegvideo")) {
st->codec->codec_id = CODEC_ID_MPEG2VIDEO;
else if (!strcmp(fmt->name, "h264"))
st->codec->codec_type = CODEC_TYPE_VIDEO;
} else if (!strcmp(fmt->name, "h264")) {
st->codec->codec_id = CODEC_ID_H264;
st->codec->codec_type = CODEC_TYPE_VIDEO;
}
}
return !!fmt;
}
......
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