diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index a5be63eb9d..9578194b1a 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -1712,6 +1712,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
           format = GST_AUDIO_FORMAT_U8;
           break;
         default:
+          format = 0;
           g_assert (0);         /* don't worry, we never get here */
           break;
       }
diff --git a/ext/libav/gstavdeinterlace.c b/ext/libav/gstavdeinterlace.c
index faa81bbae0..7dd37d0dce 100644
--- a/ext/libav/gstavdeinterlace.c
+++ b/ext/libav/gstavdeinterlace.c
@@ -289,7 +289,7 @@ gst_ffmpegdeinterlace_chain (GstPad * pad, GstObject * parent,
 
   GST_OBJECT_LOCK (deinterlace);
   if (deinterlace->reconfigure) {
-    if (deinterlace->new_mode != -1)
+    if ((gint) deinterlace->new_mode != -1)
       deinterlace->mode = deinterlace->new_mode;
     deinterlace->new_mode = -1;