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

cook: return AVERROR_PATCHWELCOME instead of ENOTSUP

Browse Source 
ENOTSUP is not defined on some systems
This commit is contained in:
Justin Ruggles 2011-10-29 14:31:11 -04:00
parent e34c6c9708
commit 5c353eb8e3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/cook.c
View File

@ -1099,7 +1099,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
case MONO: case MONO:
if (q->nb_channels != 1) { if (q->nb_channels != 1) {
av_log_ask_for_sample(avctx, "Container channels != 1.\n"); av_log_ask_for_sample(avctx, "Container channels != 1.\n");
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
av_log(avctx,AV_LOG_DEBUG,"MONO\n"); av_log(avctx,AV_LOG_DEBUG,"MONO\n");
break; break;
@ -1113,7 +1113,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
case JOINT_STEREO: case JOINT_STEREO:
if (q->nb_channels != 2) { if (q->nb_channels != 2) {
av_log_ask_for_sample(avctx, "Container channels != 2.\n"); av_log_ask_for_sample(avctx, "Container channels != 2.\n");
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n"); av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n");
if (avctx->extradata_size >= 16){ if (avctx->extradata_size >= 16){
@ -1151,7 +1151,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break; break;
default: default:
av_log_ask_for_sample(avctx, "Unknown Cook version.\n"); av_log_ask_for_sample(avctx, "Unknown Cook version.\n");
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
if(s > 1 && q->subpacket[s].samples_per_channel != q->samples_per_channel) { if(s > 1 && q->subpacket[s].samples_per_channel != q->samples_per_channel) {
@ -1167,7 +1167,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Try to catch some obviously faulty streams, othervise it might be exploitable */ /* Try to catch some obviously faulty streams, othervise it might be exploitable */
if (q->subpacket[s].total_subbands > 53) { if (q->subpacket[s].total_subbands > 53) {
av_log_ask_for_sample(avctx, "total_subbands > 53\n"); av_log_ask_for_sample(avctx, "total_subbands > 53\n");
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 2*q->subpacket[s].joint_stereo)) { if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 2*q->subpacket[s].joint_stereo)) {
@ -1178,7 +1178,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
if (q->subpacket[s].subbands > 50) { if (q->subpacket[s].subbands > 50) {
av_log_ask_for_sample(avctx, "subbands > 50\n"); av_log_ask_for_sample(avctx, "subbands > 50\n");
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
q->subpacket[s].gains1.now = q->subpacket[s].gain_1; q->subpacket[s].gains1.now = q->subpacket[s].gain_1;
q->subpacket[s].gains1.previous = q->subpacket[s].gain_2; q->subpacket[s].gains1.previous = q->subpacket[s].gain_2;
@ -1189,7 +1189,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
s++; s++;
if (s > MAX_SUBPACKETS) { if (s > MAX_SUBPACKETS) {
av_log_ask_for_sample(avctx, "Too many subpackets > 5\n"); av_log_ask_for_sample(avctx, "Too many subpackets > 5\n");
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
} }
/* Generate tables */ /* Generate tables */
@ -1233,7 +1233,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
av_log_ask_for_sample(avctx, av_log_ask_for_sample(avctx,
"unknown amount of samples_per_channel = %d\n", "unknown amount of samples_per_channel = %d\n",
q->samples_per_channel); q->samples_per_channel);
return AVERROR(ENOTSUP); return AVERROR_PATCHWELCOME;
} }
avctx->sample_fmt = AV_SAMPLE_FMT_FLT; avctx->sample_fmt = AV_SAMPLE_FMT_FLT;