Unified · Split
| @@ -730,26 +730,24 @@ static int activate(AVFilterContext *ctx) · 729 unmodified lines | ||
| 730 | 730 | static int query_formats(AVFilterContext *ctx) |
| 731 | 731 | { |
| 732 | 732 | LoudNormContext *s = ctx->priv; |
| 733 | − AVFilterFormats *formats = NULL; | |
| 734 | 733 | static const int input_srate[] = {192000, -1}; |
| 734 | + static const enum AVSampleFormat sample_fmts[] = { | |
| 735 | + AV_SAMPLE_FMT_DBL, | |
| 736 | + AV_SAMPLE_FMT_NONE | |
| 737 | + }; | |
| 735 | 738 | int ret = ff_set_common_all_channel_counts(ctx); |
| 736 | 739 | if (ret < 0) |
| 737 | 740 | return ret; |
| 738 | 741 | |
| 739 | − ret = ff_add_format(&formats, AV_SAMPLE_FMT_DBL); | |
| 740 | − if (ret) | |
| 741 | − return ret; | |
| 742 | − ret = ff_set_common_formats(ctx, formats); | |
| 743 | − if (ret) | |
| 742 | + ret = ff_set_common_formats_from_list(ctx, sample_fmts); | |
| 743 | + if (ret < 0) | |
| 744 | 744 | return ret; |
| 745 | 745 | |
| 746 | − if (s->frame_type != LINEAR_MODE) { | |
| 747 | − formats = ff_make_format_list(input_srate); | |
| 746 | + if (s->frame_type == LINEAR_MODE) { | |
| 747 | + return ff_set_common_all_samplerates(ctx); | |
| 748 | 748 | } else { |
| 749 | − formats = ff_all_samplerates(); | |
| 749 | + return ff_set_common_samplerates_from_list(ctx, input_srate); | |
| 750 | 750 | } |
| 751 | − | |
| 752 | − return ff_set_common_samplerates(ctx, formats); | |
| 753 | 751 | } |
| 754 | 752 | |
| 755 | 753 | static int config_input(AVFilterLink *inlink) |