Module: libav Branch: master Commit: 3f98848d6e04a11f28e776b665fb14e58d56e015
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Sun Dec 23 13:17:05 2012 -0500 au: validate bits-per-sample separately from codec tag --- libavformat/au.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/libavformat/au.c b/libavformat/au.c index 8f9a3fa..5499c6b 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -64,6 +64,7 @@ static int au_read_header(AVFormatContext *s) unsigned int tag; AVIOContext *pb = s->pb; unsigned int id, channels, rate; + int bps; enum AVCodecID codec; AVStream *st; @@ -80,7 +81,13 @@ static int au_read_header(AVFormatContext *s) codec = ff_codec_get_id(codec_au_tags, id); - if (!av_get_bits_per_sample(codec)) { + if (codec == AV_CODEC_ID_NONE) { + av_log_ask_for_sample(s, "unknown or unsupported codec tag: %d\n", id); + return AVERROR_PATCHWELCOME; + } + + bps = av_get_bits_per_sample(codec); + if (!bps) { av_log_ask_for_sample(s, "could not determine bits per sample\n"); return AVERROR_PATCHWELCOME; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
