Merge branch 'master' into 0.11

Conflicts:
	gst/videoscale/gstvideoscale.c

diff --cc gst-libs/gst/tag/gstexiftag.c
index e64ada4,c97901c..7dc9ac6
--- 1/gst-libs/gst/tag/gstexiftag.c
--- 2/gst-libs/gst/tag/gstexiftag.c
+++ b/gst-libs/gst/tag/gstexiftag.c
@@@ -454,8 -454,10 +454,10 @@@ static const GstExifTagMatch tag_map_gp
  /* GstExifReader functions */
  static void
  gst_exif_reader_init (GstExifReader * reader, gint byte_order,
 -    const GstBuffer * buf, guint32 base_offset)
 +    GstBuffer * buf, guint32 base_offset)
  {
+   ensure_exif_tags ();
+ 
    reader->taglist = gst_tag_list_new ();
    reader->buffer = buf;
    reader->base_offset = base_offset;

diff --cc gst-libs/gst/tag/tag.h
Simple merge

diff --cc gst-libs/gst/tag/tags.c
Simple merge

diff --cc gst/audioresample/gstaudioresample.c
Simple merge

diff --cc gst/videoscale/gstvideoscale.c
index a404286,b941ed0..c49c5b4
--- 1/gst/videoscale/gstvideoscale.c
--- 2/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@@ -1019,14 -1022,20 +1019,22 @@@ gst_video_scale_transform (GstBaseTrans
    add_borders = videoscale->add_borders;
    GST_OBJECT_UNLOCK (videoscale);
  
+   if (videoscale->from_width == 1) {
+     method = GST_VIDEO_SCALE_NEAREST;
+   }
+   if (method == GST_VIDEO_SCALE_4TAP &&
+       (videoscale->from_width < 4 || videoscale->from_height < 4)) {
+     method = GST_VIDEO_SCALE_BILINEAR;
+   }
+ 
 +  in_data = gst_buffer_map (in, &in_size, NULL, GST_MAP_READ);
 +  out_data = gst_buffer_map (out, &out_size, NULL, GST_MAP_WRITE);
 +
    gst_video_scale_setup_vs_image (&src, videoscale->format, 0,
 -      videoscale->from_width, videoscale->from_height, 0, 0,
 -      GST_BUFFER_DATA (in));
 +      videoscale->from_width, videoscale->from_height, 0, 0, in_data);
    gst_video_scale_setup_vs_image (&dest, videoscale->format, 0,
        videoscale->to_width, videoscale->to_height, videoscale->borders_w,
 -      videoscale->borders_h, GST_BUFFER_DATA (out));
 +      videoscale->borders_h, out_data);
  
    if (videoscale->format == GST_VIDEO_FORMAT_I420
        || videoscale->format == GST_VIDEO_FORMAT_YV12

diff --cc tests/check/elements/videoscale.c
index 271a239,276261f..d9394e7
--- 1/tests/check/elements/videoscale.c
--- 2/tests/check/elements/videoscale.c
+++ b/tests/check/elements/videoscale.c
@@@ -640,16 -634,9 +640,12 @@@ gst_test_reverse_negotiation_sink_rende
  }
  
  static void
 -gst_test_reverse_negotiation_sink_base_init (gpointer g_class)
 +gst_test_reverse_negotiation_sink_class_init (GstTestReverseNegotiationSinkClass
 +    * klass)
  {
-   GObjectClass *gobject_class;
-   GstElementClass *gstelement_class;
 -  GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class);
 +  GstBaseSinkClass *gstbase_sink_class;
 +
-   gobject_class = G_OBJECT_CLASS (klass);
-   gstelement_class = GST_ELEMENT_CLASS (klass);
 +  gstbase_sink_class = GST_BASE_SINK_CLASS (klass);
  
    gst_element_class_set_details_simple (gstelement_class,
        "Test Reverse Negotiation Sink",