diff options
author | James Almer <jamrial@gmail.com> | 2017-03-21 12:02:35 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-21 12:17:03 -0300 |
commit | 2423dd965637e1baecd9ad0ec3ecaf9ca59ff66e (patch) | |
tree | 29abf82237587be3f08736878878501dc7d96049 | |
parent | dffd455b9b6a6bd01ea073cdb59d62242bf0c377 (diff) | |
download | ffmpeg-2423dd965637e1baecd9ad0ec3ecaf9ca59ff66e.tar.gz |
swresample/resample: move resample_free() higher in the file
Also make it more readable while at it.
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 2a8a8a2e98136c22f6e07ff669251afb8a033676)
Conflicts:
libswresample/resample.c
-rw-r--r-- | libswresample/resample.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index d410432658..a0c2a3a85b 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -295,6 +295,14 @@ fail: return 0; } +static void resample_free(ResampleContext **cc){ + ResampleContext *c = *cc; + if(!c) + return; + av_freep(&c->filter_bank); + av_freep(cc); +} + static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff0, enum AVSampleFormat format, enum SwrFilterType filter_type, double kaiser_beta, double precision, int cheby) @@ -375,13 +383,6 @@ error: return NULL; } -static void resample_free(ResampleContext **c){ - if(!*c) - return; - av_freep(&(*c)->filter_bank); - av_freep(c); -} - static int set_compensation(ResampleContext *c, int sample_delta, int compensation_distance){ c->compensation_distance= compensation_distance; if (compensation_distance) |