diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 00:02:50 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2013-05-08 19:05:21 +0200 |
commit | 1ab4578c88dc3e1407da15471bd323ba40c3ebbb (patch) | |
tree | 76c3ebde8c64ad66aaef22bd2c31d6cbe30b360b | |
parent | 52ab9e898485b370a4da46febb91e1ba50a1c357 (diff) | |
download | ffmpeg-1ab4578c88dc3e1407da15471bd323ba40c3ebbb.tar.gz |
lavc: Fix assignments in if() when calling ff_af_queue_add
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1d7ffd06e41e44d8932d0dd62caa2da17947d8c4)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r-- | libavcodec/aacenc.c | 2 | ||||
-rw-r--r-- | libavcodec/libfaac.c | 2 | ||||
-rw-r--r-- | libavcodec/libfdk-aacenc.c | 2 | ||||
-rw-r--r-- | libavcodec/libmp3lame.c | 2 | ||||
-rw-r--r-- | libavcodec/libopencore-amr.c | 2 | ||||
-rw-r--r-- | libavcodec/libspeexenc.c | 2 | ||||
-rw-r--r-- | libavcodec/libvo-aacenc.c | 2 | ||||
-rw-r--r-- | libavcodec/libvorbis.c | 2 | ||||
-rw-r--r-- | libavcodec/nellymoserenc.c | 2 | ||||
-rw-r--r-- | libavcodec/ra144enc.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 5558e39d17..6f582ca8aa 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -518,7 +518,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* add current frame to queue */ if (frame) { - if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) + if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) return ret; } diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index 745fee2674..d32e776678 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -200,7 +200,7 @@ static int Faac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* add current frame to the queue */ if (frame) { - if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) + if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) return ret; } diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 00397d58ed..c40bcedba5 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -334,7 +334,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, in_buf.bufElSizes = &in_buffer_element_size; /* 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; } diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 8746573224..2e501cac0b 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -236,7 +236,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, /* add current frame to the queue */ if (frame) { - if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) + if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) return ret; } diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index fdd7de9c53..be98b1f93b 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -265,7 +265,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (frame->nb_samples < avctx->frame_size - avctx->delay) 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); return ret; } diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index e30185a758..4277e62e4c 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -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_int(s->enc_state, samples, &s->bits); 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; } else { /* handle end-of-stream */ diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index d09f1ed109..31822b5d73 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -157,7 +157,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, samples = (VO_PBYTE)frame->data[0]; } /* 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; } diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c index a31d476c74..092cbbc0a7 100644 --- a/libavcodec/libvorbis.c +++ b/libavcodec/libvorbis.c @@ -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"); 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; } else { if (!s->eof) diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 487cffd2dc..122282623c 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -397,7 +397,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (frame->nb_samples >= NELLY_BUF_LEN) 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; } else { memset(s->buf + NELLY_BUF_LEN, 0, NELLY_SAMPLES * sizeof(*s->buf)); diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 5b5de76434..b9473ac197 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -537,7 +537,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, for (; i < frame->nb_samples; i++) 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; } else ractx->last_frame = 1; |