diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:31:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 22:47:45 +0200 |
| commit | 81a663f49edd265dc846ff3854579415cac1d5bb (patch) | |
| tree | 316eba8de3800371865b42b36831e9829bf775f7 /libavfilter | |
| parent | 60dbed6067676d847157fe530b1caed06c77e2ab (diff) | |
| download | ffmpeg-81a663f49edd265dc846ff3854579415cac1d5bb.tar.gz | |
Drop remaining unneeded != NULL
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_amix.c | 4 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/vf_eq2.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 1eef70d8c4..d8a6651fce 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -110,7 +110,7 @@ static void frame_list_remove_samples(FrameList *frame_list, int nb_samples) int samples = nb_samples; while (samples > 0) { FrameInfo *info = frame_list->list; - av_assert0(info != NULL); + av_assert0(info); if (info->nb_samples <= samples) { samples -= info->nb_samples; frame_list->list = info->next; @@ -142,7 +142,7 @@ static int frame_list_add_frame(FrameList *frame_list, int nb_samples, int64_t p frame_list->list = info; frame_list->end = info; } else { - av_assert0(frame_list->end != NULL); + av_assert0(frame_list->end); frame_list->end->next = info; frame_list->end = info; } diff --git a/libavfilter/libmpcodecs/vf_eq2.c b/libavfilter/libmpcodecs/vf_eq2.c index c9c3ff69f4..03568139f3 100644 --- a/libavfilter/libmpcodecs/vf_eq2.c +++ b/libavfilter/libmpcodecs/vf_eq2.c @@ -265,7 +265,7 @@ int put_image (vf_instance_t *vf, mp_image_t *src, double pts) dst = ff_vf_get_image (vf->next, src->imgfmt, MP_IMGTYPE_EXPORT, 0, src->w, src->h); for (i = 0; i < ((src->num_planes>1)?3:1); i++) { - if (eq2->param[i].adjust != NULL) { + if (eq2->param[i].adjust) { dst->planes[i] = eq2->buf[i]; dst->stride[i] = eq2->buf_w[i]; @@ -439,7 +439,7 @@ int query_format (vf_instance_t *vf, unsigned fmt) static void uninit (vf_instance_t *vf) { - if (vf->priv != NULL) { + if (vf->priv) { free (vf->priv->buf[0]); free (vf->priv); } @@ -482,7 +482,7 @@ int vf_open(vf_instance_t *vf, char *args) eq2->ggamma = 1.0; eq2->bgamma = 1.0; - if (args != NULL) { + if (args) { par[0] = 1.0; par[1] = 1.0; par[2] = 0.0; |