diff --git a/Android.mk b/Android.mk
index fb349cf057..d858ab8eab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,8 +70,11 @@ GST_PLUGINS_BAD_BUILT_SOURCES := \
 	gst/stereo/Android.mk \
 	gst/rtpvp8/Android.mk \
 	gst/mpegdemux/Android.mk \
-	gst/ivfparse/Android.mk \
-	ext/faad/Android.mk
+	gst/ivfparse/Android.mk
+
+ifneq ($(NDK_BUILD), true)
+GST_PLUGINS_BAD_BUILT_SOURCES += ext/faad/Android.mk
+endif
 
 GST_PLUGINS_BAD_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BAD_TOP))/%, $(GST_PLUGINS_BAD_BUILT_SOURCES))
 
@@ -110,7 +113,9 @@ CONFIGURE_TARGETS += gst-plugins-bad-configure
 -include $(GST_PLUGINS_BAD_TOP)/gst/aiff/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/asfmux/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/videoparsers/Android.mk
+ifneq ($(NDK_BUILD), true)
 -include $(GST_PLUGINS_BAD_TOP)/ext/faad/Android.mk
+endif
 -include $(GST_PLUGINS_BAD_TOP)/gst/sdp/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/hls/Android.mk
 -include $(GST_PLUGINS_BAD_TOP)/gst/jp2kdecimator/Android.mk
diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c
index 5ad9bb677d..9d02e0d2d2 100644
--- a/ext/assrender/gstassrender.c
+++ b/ext/assrender/gstassrender.c
@@ -1094,7 +1094,7 @@ gst_ass_render_chain_text (GstPad * pad, GstBuffer * buffer)
     g_mutex_lock (render->subtitle_mutex);
     if (G_UNLIKELY (render->subtitle_flushing)) {
       GST_DEBUG_OBJECT (render, "Text pad flushing");
-      gst_object_unref (buffer);
+      gst_buffer_unref (buffer);
       g_mutex_unlock (render->subtitle_mutex);
       return GST_FLOW_WRONG_STATE;
     }
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
index 654c1a7bb0..3dde8d6d64 100644
--- a/gst-libs/gst/codecparsers/gstvc1parser.c
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
@@ -781,13 +781,13 @@ static inline void
 calculate_framerate_bitrate (guint8 frmrtq_postproc, guint8 bitrtq_postproc,
     guint * framerate, guint * bitrate)
 {
-  if (frmrtq_postproc == 0 && bitrtq_postproc == 30) {
+  if (frmrtq_postproc == 0 && bitrtq_postproc == 31) {
     *framerate = 0;
     *bitrate = 0;
   } else if (frmrtq_postproc == 0 && bitrtq_postproc == 30) {
     *framerate = 2;
     *bitrate = 1952;
-  } else if (frmrtq_postproc == 0 && bitrtq_postproc == 31) {
+  } else if (frmrtq_postproc == 1 && bitrtq_postproc == 31) {
     *framerate = 6;
     *bitrate = 2016;
   } else {
@@ -1804,13 +1804,13 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
 
   READ_UINT32 (&br, seqlayer->numframes, 24);
 
-  if (parse_sequence_header_struct_c (&br, &seqlayer->struct_c) ==
-      GST_VC1_PARSER_ERROR)
-    goto failed;
-
   READ_UINT32 (&br, tmp, 32);
   if (tmp != 0x04)
     goto failed;
+  
+  if (parse_sequence_header_struct_c (&br, &seqlayer->struct_c) ==
+      GST_VC1_PARSER_ERROR)
+    goto failed;
 
   if (parse_sequence_header_struct_a (&br, &seqlayer->struct_a) ==
       GST_VC1_PARSER_ERROR)
diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c
index 1471954473..3401c8157b 100644
--- a/gst/nuvdemux/gstnuvdemux.c
+++ b/gst/nuvdemux/gstnuvdemux.c
@@ -637,7 +637,7 @@ gst_nuv_demux_stream_extend_header (GstNuvDemux * nuv)
     nuv->state = GST_NUV_DEMUX_INVALID_DATA;
     GST_ELEMENT_ERROR (nuv, STREAM, DEMUX, (NULL),
         ("Unsupported extended header (0x%02x)", buf->data[0]));
-    g_object_unref (buf);
+    gst_buffer_unref (buf);
     return GST_FLOW_ERROR;
   }
   return res;