[FFmpeg-cvslog] avutil/avstring: fix () position

Michael Niedermayer git at videolan.org
Wed Dec 11 21:31:46 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 11 21:09:56 2013 +0100| [9ab5cf5417d7ee48bb3c4c78c79cc437c4a9efd3] | committer: Michael Niedermayer

avutil/avstring: fix () position

Fixes CID1135751

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

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

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

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 2093107..f4374fd 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -362,8 +362,8 @@ int av_utf8_decode(int32_t *codep, const uint8_t **bufp, const uint8_t *buf_end,
     if (code >= 0xD800 && code <= 0xDFFF &&
         !(flags & AV_UTF8_FLAG_ACCEPT_SURROGATES))
         ret = AVERROR(EILSEQ);
-    if (code == 0xFFFE || code == 0xFFFF &&
-        (!flags & AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS))
+    if ((code == 0xFFFE || code == 0xFFFF) &&
+        !(flags & AV_UTF8_FLAG_ACCEPT_NON_CHARACTERS))
         ret = AVERROR(EILSEQ);
 
 end:



More information about the ffmpeg-cvslog mailing list