summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2010-03-31 10:45:15 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-03-31 10:45:15 +0000
commit46da7fa133bcce2053d04fbb11ecd66b27a0c81e (patch)
tree7d691c479c6d7ef6534552cd33d0932e9005c0b6 /libavformat
parent8166c498df7e4d28e0018266572e7ba5c3ce7f63 (diff)
downloadffmpeg-46da7fa133bcce2053d04fbb11ecd66b27a0c81e.tar.gz
Probe aac codecs for CODEC_ID_PROBE.
Patch by Joakim Plate, elupus ecce se Originally committed as revision 22742 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8b57b39d59..23731a8e6b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -370,6 +370,9 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, AVProbeDa
} else if (!strcmp(fmt->name, "dts")) {
st->codec->codec_id = CODEC_ID_DTS;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ } else if (!strcmp(fmt->name, "aac")) {
+ st->codec->codec_id = CODEC_ID_AAC;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
}
}
return !!fmt;