Browse Source

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

Originally committed as revision 14966 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Andreas Öman 17 years ago
parent
commit
f1588ed525
1 changed files with 9 additions and 4 deletions
  1. +9
    -4
      libavformat/utils.c

+ 9
- 4
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);

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;
}


Loading…
Cancel
Save