[FFmpeg-cvslog] avutil/common: put ERROR statements into separate code blocks in GET_UTF8/16

Marton Balint git at videolan.org
Fri Jan 31 01:24:57 EET 2020


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Wed Jan 29 23:42:21 2020 +0100| [d9f5fe4ed707d2d55680c8fd2eaf651a478af4c8] | committer: Marton Balint

avutil/common: put ERROR statements into separate code blocks in GET_UTF8/16

To be able to safely use more than one statement in ERROR.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavutil/common.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/common.h b/libavutil/common.h
index 02671190a6..e6f076a13c 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -387,11 +387,11 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
     {\
         uint32_t top = (val & 128) >> 1;\
         if ((val & 0xc0) == 0x80 || val >= 0xFE)\
-            ERROR\
+            {ERROR}\
         while (val & top) {\
             unsigned int tmp = (GET_BYTE) - 128;\
             if(tmp>>6)\
-                ERROR\
+                {ERROR}\
             val= (val<<6) + tmp;\
             top <<= 5;\
         }\
@@ -414,7 +414,7 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
         if (hi < 0x800) {\
             val = (GET_16BIT) - 0xDC00;\
             if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
+                {ERROR}\
             val += (hi<<10) + 0x10000;\
         }\
     }\



More information about the ffmpeg-cvslog mailing list