From 8faa6231db51327b3a39cf5ce2c2e4ff982b10fd Mon Sep 17 00:00:00 2001
From: Hans-Kristian Arntzen <maister@archlinux.us>
Date: Sun, 8 May 2016 09:37:27 +0200
Subject: [PATCH] Fix some warnings.

---
 Makefile.common                      | 2 +-
 libretro-common/formats/jpeg/rjpeg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 154ffdc4bf..7ea3441a0f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1014,7 +1014,7 @@ ifeq ($(HAVE_FFMPEG), 1)
           cores/libretro-ffmpeg/ffmpeg_core.o
    LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
    DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
-   DEFINES += -DHAVE_FFMPEG -Iffmpeg
+   DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg
 endif
 
 ifeq ($(HAVE_COMPRESSION), 1)
diff --git a/libretro-common/formats/jpeg/rjpeg.c b/libretro-common/formats/jpeg/rjpeg.c
index ddb6698be2..df45b8ffb5 100644
--- a/libretro-common/formats/jpeg/rjpeg.c
+++ b/libretro-common/formats/jpeg/rjpeg.c
@@ -429,7 +429,7 @@ static INLINE void rjpeg_decode_block(
       struct rjpeg_component *c,
       unsigned char* out)
 {
-   unsigned char code;
+   unsigned char code = 0;
    int coef = 0;
 
    memset(ctx->block, 0, sizeof(ctx->block));