[FFmpeg-cvslog] swr: Fix ASSERT_LEVEL warning

Michael Niedermayer git at videolan.org
Mon Jun 8 20:24:29 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 20:16:06 2015 +0200| [56f0fe6b8434d25917c41a343323950291d8db21] | committer: Michael Niedermayer

swr: Fix ASSERT_LEVEL warning

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

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

 libswresample/swresample.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 8e9efb2..ab02bac 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -693,7 +693,7 @@ int attribute_align_arg swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_C
         av_log(s, AV_LOG_ERROR, "Context has not been initialized\n");
         return AVERROR(EINVAL);
     }
-#if ASSERT_LEVEL >1
+#if defined(ASSERT_LEVEL) && ASSERT_LEVEL >1
     max_output = swr_get_out_samples(s, in_count);
 #endif
 



More information about the ffmpeg-cvslog mailing list