History

avfilter/af_mcompand: Remove redundant calls to AVFilter.uninit

uninit is already called automatically (even when configuring the filter failed).

Andreas Rheinhardt committed 6 years ago

Commit 6ef55f51 parent 746ab831 file · +3 −16Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/af_mcompand.c+3−16
@@ -361,10 +361,8 @@ static int config_output(AVFilterLink *outlink) · 360 unmodified lines
361361 char *p2, *p3, *saveptr2 = NULL, *saveptr3 = NULL;
362362 double radius;
363363
364− if (!tstr) {
365− uninit(ctx);
364+ if (!tstr)
366365 return AVERROR(EINVAL);
367− }
368366 p = NULL;
369367
370368 p2 = tstr;
@@ -372,7 +370,6 @@ static int config_output(AVFilterLink *outlink) · 1 unmodified line
372370 tstr2 = av_strtok(p2, " ", &saveptr2);
373371 if (!tstr2) {
374372 av_log(ctx, AV_LOG_ERROR, "at least one attacks/decays rate is mandatory\n");
375− uninit(ctx);
376373 return AVERROR(EINVAL);
377374 }
378375 p2 = NULL;
@@ -381,7 +378,6 @@ static int config_output(AVFilterLink *outlink) · 2 unmodified lines
381378 count_items(tstr2, &nb_attacks, ',');
382379 if (!nb_attacks || nb_attacks & 1) {
383380 av_log(ctx, AV_LOG_ERROR, "number of attacks rate plus decays rate must be even\n");
384− uninit(ctx);
385381 return AVERROR(EINVAL);
386382 }
387383
@@ -417,7 +413,6 @@ static int config_output(AVFilterLink *outlink) · 29 unmodified lines
417413 tstr2 = av_strtok(p2, " ", &saveptr2);
418414 if (!tstr2) {
419415 av_log(ctx, AV_LOG_ERROR, "transfer function curve in dB must be set\n");
420− uninit(ctx);
421416 return AVERROR(EINVAL);
422417 }
423418 sscanf(tstr2, "%lf", &s->bands[i].transfer_fn.curve_dB);
@@ -427,7 +422,6 @@ static int config_output(AVFilterLink *outlink) · 3 unmodified lines
427422 tstr2 = av_strtok(p2, " ", &saveptr2);
428423 if (!tstr2) {
429424 av_log(ctx, AV_LOG_ERROR, "transfer points missing\n");
430− uninit(ctx);
431425 return AVERROR(EINVAL);
432426 }
433427
@@ -435,38 +429,31 @@ static int config_output(AVFilterLink *outlink) · 1 unmodified line
435429 s->bands[i].transfer_fn.nb_segments = (nb_points + 4) * 2;
436430 s->bands[i].transfer_fn.segments = av_calloc(s->bands[i].transfer_fn.nb_segments,
437431 sizeof(CompandSegment));
438− if (!s->bands[i].transfer_fn.segments) {
439− uninit(ctx);
432+ if (!s->bands[i].transfer_fn.segments)
440433 return AVERROR(ENOMEM);
441− }
442434
443435 ret = parse_points(tstr2, nb_points, radius, &s->bands[i].transfer_fn, ctx);
444436 if (ret < 0) {
445437 av_log(ctx, AV_LOG_ERROR, "transfer points parsing failed\n");
446− uninit(ctx);
447438 return ret;
448439 }
449440
450441 tstr2 = av_strtok(p2, " ", &saveptr2);
451442 if (!tstr2) {
452443 av_log(ctx, AV_LOG_ERROR, "crossover_frequency is missing\n");
453− uninit(ctx);
454444 return AVERROR(EINVAL);
455445 }
456446
457447 new_nb_items += sscanf(tstr2, "%lf", &s->bands[i].topfreq) == 1;
458448 if (s->bands[i].topfreq < 0 || s->bands[i].topfreq >= outlink->sample_rate / 2) {
459449 av_log(ctx, AV_LOG_ERROR, "crossover_frequency: %f, should be >=0 and lower than half of sample rate: %d.\n", s->bands[i].topfreq, outlink->sample_rate / 2);
460− uninit(ctx);
461450 return AVERROR(EINVAL);
462451 }
463452
464453 if (s->bands[i].topfreq != 0) {
465454 ret = crossover_setup(outlink, &s->bands[i].filter, s->bands[i].topfreq);
466− if (ret < 0) {
467− uninit(ctx);
455+ if (ret < 0)
468456 return ret;
469− }
470457 }
471458
472459 tstr2 = av_strtok(p2, " ", &saveptr2);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t