[FFmpeg-cvslog] swresample: do not put multiple statements in one line

Michael Niedermayer git at videolan.org
Thu Oct 16 22:36:16 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 16 18:18:40 2014 +0200| [080c846f5999f71f2e1f46327656f3cc7080f700] | committer: Michael Niedermayer

swresample: do not put multiple statements in one line

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswresample/swresample.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index fc58d43..b4d8f32 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -435,9 +435,15 @@ static int resample(SwrContext *s, AudioData *out_param, int out_count,
 
     border = s->resampler->invert_initial_buffer(s->resample, &s->in_buffer,
                  &in, in_count, &s->in_buffer_index, &s->in_buffer_count);
-    if (border == INT_MAX) return 0;
-    else if (border < 0) return border;
-    else if (border) { buf_set(&in, &in, border); in_count -= border; s->resample_in_constraint = 0; }
+    if (border == INT_MAX) {
+        return 0;
+    } else if (border < 0) {
+        return border;
+    } else if (border) {
+        buf_set(&in, &in, border);
+        in_count -= border;
+        s->resample_in_constraint = 0;
+    }
 
     do{
         int ret, size, consumed;



More information about the ffmpeg-cvslog mailing list