Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'

* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
  swscale: Remove unnecessary backslashes
  jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Conflicts:
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 7 insertions, 7 deletions

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index ac801edba8..ac69d7eb7a 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -635,13 +635,13 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
             Jpeg2000Cblk *cblk = prec->cblk + cblkno;
             if (s->buf_end - s->buf < cblk->lengthinc)
                 return AVERROR(EINVAL);
-            /* A code-block data can be empty. In that case initialize data
-             * with 0xffff. */
-            if (cblk->lengthinc > 0)
+            /* Code-block data can be empty. In that case initialize data
+             * with 0xFFFF. */
+            if (cblk->lengthinc > 0) {
                 bytestream_get_buffer(&s->buf, cblk->data, cblk->lengthinc);
-            else {
-                cblk->data[0] = 0xff;
-                cblk->data[1] = 0xff;
+            } else {
+                cblk->data[0] = 0xFF;
+                cblk->data[1] = 0xFF;
             }
             cblk->length   += cblk->lengthinc;
             cblk->lengthinc = 0;
@@ -864,7 +864,7 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
         memset(t1->data[y], 0, width * sizeof(width));
 
     /* If code-block contains no compressed data: nothing to do. */
-    if (cblk->length == 0)
+    if (!cblk->length)
         return 0;
     for (y = 0; y < height + 2; y++)
         memset(t1->flags[y], 0, (width + 2) * sizeof(width));