mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 12:09:55 +00:00
Make faac_decode_frame return -1 on error and not 0 which avoids
stalling and infinite loop. Patch by Baptiste COUDURIER <baptiste coudurier at smartjog com> Originally committed as revision 5110 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7a5b2fa812
commit
980bbb13d6
@ -164,7 +164,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
|
||||
if(r < 0){
|
||||
av_log(avctx, AV_LOG_ERROR, "faac: codec init failed: %s\n",
|
||||
s->faacDecGetErrorMessage(frame_info.error));
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
avctx->sample_rate = srate;
|
||||
avctx->channels = channels;
|
||||
@ -176,7 +176,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
|
||||
if (frame_info.error > 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n",
|
||||
s->faacDecGetErrorMessage(frame_info.error));
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
|
||||
frame_info.samples *= s->sample_size;
|
||||
|
Loading…
Reference in New Issue
Block a user