[FFmpeg-cvslog] swresample/resample: move resample_free() higher in the file

[James Almer]

ffmpeg | branch: release/2.8 | James Almer <jamr...@gmail.com> | Tue Mar 21 
12:02:35 2017 -0300| [f7f5a524590bf3da35d3f84eefbf08cf7795468b] | committer: 
James Almer

swresample/resample: move resample_free() higher in the file

Also make it more readable while at it.

Signed-off-by: James Almer <jamr...@gmail.com>
(cherry picked from commit 2a8a8a2e98136c22f6e07ff669251afb8a033676)

Conflicts:
        libswresample/resample.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7f5a524590bf3da35d3f84eefbf08cf7795468b
---

 libswresample/resample.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libswresample/resample.c b/libswresample/resample.c
index 8f3eb41..97bf9c4 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -171,6 +171,14 @@ static int build_filter(ResampleContext *c, void *filter, 
double factor, int tap
     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, int kaiser_beta,
                                     double precision, int cheby)
@@ -251,13 +259,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)

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog