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

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

Browse Source 
Originally committed as revision 14966 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Andreas Öman
2008-08-25 15:39:43 +00:00
parent 8580314463
commit f1588ed525
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/utils.c
View File

@@ -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); fmt = av_probe_input_format2(pd, 1, &score);
if (fmt) { if (fmt) {
if (!strcmp(fmt->name, "mp3")) if (!strcmp(fmt->name, "mp3")) {
st->codec->codec_id = CODEC_ID_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; 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; 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_id = CODEC_ID_H264;
st->codec->codec_type = CODEC_TYPE_VIDEO;
}
} }
return !!fmt; return !!fmt;
} }