avfilter: Remove redundant ff_formats/channel_layouts_unref()

ff_add_format() and ff_add_channel_layout() already unref the list upon error.

Andreas Rheinhardt committed 6 years ago

Commit e013a711 parent 257cd5f3 files · +4 −7Browse files

Unified · Split

3 files

libavfilter/af_aformat.c +4 −5
libavfilter/vf_shuffleplanes.c +0 −1
libavfilter/vf_weave.c +0 −1

 AVFILTER_DEFINE_CLASS(aformat);
-#define PARSE_FORMATS(str, type, list, add_to_list, unref_fn, get_fmt, none, desc)    \
+#define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc)    \
 do {                                                                        \
     char *next, *cur = str, sep;                                            \
     int ret;                                                                \
             return AVERROR(EINVAL);                                         \
         }                                                                   \
         if ((ret = add_to_list(&list, fmt)) < 0) {                          \
-            unref_fn(&list);                                                \
             return ret;                                                     \
         }                                                                   \
                                                                             \
     AFormatContext *s = ctx->priv;
     PARSE_FORMATS(s->formats_str, enum AVSampleFormat, s->formats,
-                  ff_add_format, ff_formats_unref, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format");
+                  ff_add_format, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format");
-    PARSE_FORMATS(s->sample_rates_str, int, s->sample_rates, ff_add_format, ff_formats_unref,
+    PARSE_FORMATS(s->sample_rates_str, int, s->sample_rates, ff_add_format,
                   get_sample_rate, 0, "sample rate");
     PARSE_FORMATS(s->channel_layouts_str, uint64_t, s->channel_layouts,
-                  ff_add_channel_layout, ff_channel_layouts_unref, av_get_channel_layout, 0,
+                  ff_add_channel_layout, av_get_channel_layout, 0,
                   "channel layout");
     return 0;

libavfilter/vf_shuffleplanes.c+0−1

@@ -64,7 +64,6 @@ static int query_formats(AVFilterContext *ctx) · 63 unmodified lines
64	if (i != 4)	64	if (i != 4)
65	continue;	65	continue;
66	if ((ret = ff_add_format(&formats, fmt)) < 0) {	66	if ((ret = ff_add_format(&formats, fmt)) < 0) {
67	ff_formats_unref(&formats);
68	return ret;	67	return ret;
69	}	68	}
70	}	69	}

libavfilter/vf_weave.c+0−1

@@ -60,7 +60,6 @@ static int query_formats(AVFilterContext *ctx) · 59 unmodified lines
60	if (!(desc->flags & AV_PIX_FMT_FLAG_PAL) &&	60	if (!(desc->flags & AV_PIX_FMT_FLAG_PAL) &&
61	!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {	61	!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
62	if ((ret = ff_add_format(&formats, fmt)) < 0) {	62	if ((ret = ff_add_format(&formats, fmt)) < 0) {
63	ff_formats_unref(&formats);
64	return ret;	63	return ret;
65	}	64	}
66	}	65	}

avfilter: Remove redundant ff_formats/channel_layouts_unref()

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code