Signed-off-by: Martin Storsjö <martin@martin.st>tags/n1.2
| @@ -518,7 +518,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| /* add current frame to queue */ | /* add current frame to queue */ | ||||
| if (frame) { | if (frame) { | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -200,7 +200,7 @@ static int Faac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| /* add current frame to the queue */ | /* add current frame to the queue */ | ||||
| if (frame) { | if (frame) { | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -334,7 +334,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| in_buf.bufElSizes = &in_buffer_element_size; | in_buf.bufElSizes = &in_buffer_element_size; | ||||
| /* add current frame to the queue */ | /* add current frame to the queue */ | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -236,7 +236,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| /* add current frame to the queue */ | /* add current frame to the queue */ | ||||
| if (frame) { | if (frame) { | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -262,7 +262,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| if (frame->nb_samples < avctx->frame_size - avctx->delay) | if (frame->nb_samples < avctx->frame_size - avctx->delay) | ||||
| s->enc_last_frame = -1; | s->enc_last_frame = -1; | ||||
| } | } | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) { | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) { | |||||
| av_freep(&flush_buf); | av_freep(&flush_buf); | ||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -287,7 +287,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| speex_encode_stereo_int(samples, s->header.frame_size, &s->bits); | speex_encode_stereo_int(samples, s->header.frame_size, &s->bits); | ||||
| speex_encode_int(s->enc_state, samples, &s->bits); | speex_encode_int(s->enc_state, samples, &s->bits); | ||||
| s->pkt_frame_count++; | s->pkt_frame_count++; | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } else { | } else { | ||||
| /* handle end-of-stream */ | /* handle end-of-stream */ | ||||
| @@ -157,7 +157,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| samples = (VO_PBYTE)frame->data[0]; | samples = (VO_PBYTE)frame->data[0]; | ||||
| } | } | ||||
| /* add current frame to the queue */ | /* add current frame to the queue */ | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } | } | ||||
| @@ -279,7 +279,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| av_log(avctx, AV_LOG_ERROR, "error in vorbis_analysis_wrote()\n"); | av_log(avctx, AV_LOG_ERROR, "error in vorbis_analysis_wrote()\n"); | ||||
| return vorbis_error_to_averror(ret); | return vorbis_error_to_averror(ret); | ||||
| } | } | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } else { | } else { | ||||
| if (!s->eof) | if (!s->eof) | ||||
| @@ -397,7 +397,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| if (frame->nb_samples >= NELLY_BUF_LEN) | if (frame->nb_samples >= NELLY_BUF_LEN) | ||||
| s->last_frame = 1; | s->last_frame = 1; | ||||
| } | } | ||||
| if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } else { | } else { | ||||
| memset(s->buf + NELLY_BUF_LEN, 0, NELLY_SAMPLES * sizeof(*s->buf)); | memset(s->buf + NELLY_BUF_LEN, 0, NELLY_SAMPLES * sizeof(*s->buf)); | ||||
| @@ -537,7 +537,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| for (; i < frame->nb_samples; i++) | for (; i < frame->nb_samples; i++) | ||||
| ractx->curr_block[i] = samples[i] >> 2; | ractx->curr_block[i] = samples[i] >> 2; | ||||
| if ((ret = ff_af_queue_add(&ractx->afq, frame) < 0)) | |||||
| if ((ret = ff_af_queue_add(&ractx->afq, frame)) < 0) | |||||
| return ret; | return ret; | ||||
| } else | } else | ||||
| ractx->last_frame = 1; | ractx->last_frame = 1; | ||||