openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 13:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make wmaprodec.c:decode_init() return AVERROR_INVALIDDATA /

Browse Source 
AVERROR_PATCHWELCOME in case of invalid / unsupported number of
channels specified, rather than return AVERROR_NOTSUPP.

Originally committed as revision 22674 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-03-25 21:01:35 +00:00
parent ab379c671f
commit c5c20ae436
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/wmaprodec.c
View File

@ -343,9 +343,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
}
if (s->num_channels < 0 || s->num_channels > WMAPRO_MAX_CHANNELS) {
av_log_ask_for_sample(avctx, "invalid number of channels\n");
return AVERROR_NOTSUPP;
if (s->num_channels < 0) {
av_log(avctx, AV_LOG_ERROR, "invalid number of channels %d\n", s->num_channels);
return AVERROR_INVALIDDATA;
} else if (s->num_channels > WMAPRO_MAX_CHANNELS) {
av_log_ask_for_sample(avctx, "unsupported number of channels\n");
return AVERROR_PATCHWELCOME;
}
INIT_VLC_STATIC(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE,