[FFmpeg-cvslog] swresample/swresample: replace always true if() by av_assert0()

Michael Niedermayer git at videolan.org
Mon Oct 6 01:30:40 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 01:29:15 2014 +0200| [6b347f519d5303c56fe21195aeb2a2eb91221061] | committer: Michael Niedermayer

swresample/swresample: replace always true if() by av_assert0()

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

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

 libswresample/swresample.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index c325513..fc58d43 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -668,8 +668,8 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
             continue;
         }
 
-        if(s->drop_output || !out_arg)
-            return 0;
+        av_assert0(s->drop_output);
+        return 0;
     }
 
     if(!in_arg){



More information about the ffmpeg-cvslog mailing list