From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Fri, 15 Jun 2012 10:28:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Tag: 1.19.3~499^2~892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85f0dcb1e8a6ff12b2432da7ebb6ad11b283c7e8;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/0.10'
---

85f0dcb1e8a6ff12b2432da7ebb6ad11b283c7e8
diff --cc ext/ffmpeg/gstffmpegvidenc.c
index ce7b650,bbb1bec..b013ede
--- a/ext/ffmpeg/gstffmpegvidenc.c
+++ b/ext/ffmpeg/gstffmpegvidenc.c
@@@ -85,8 -84,8 +85,7 @@@ gst_ffmpegvidenc_me_method_get_type (vo
    };
    if (!ffmpegenc_me_method_type) {
      ffmpegenc_me_method_type =
--        g_enum_register_static ("GstFFMpegVidEncMeMethod",
--        ffmpegenc_me_methods);
++        g_enum_register_static ("GstLibAVVidEncMeMethod", ffmpegenc_me_methods);
    }
    return ffmpegenc_me_method_type;
  }
@@@ -677,9 -663,8 +676,9 @@@ gst_ffmpegvidenc_handle_frame (GstVideo
    /* Fill avpicture */
    for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
      if (c < GST_VIDEO_INFO_N_COMPONENTS (info)) {
 -      ffmpegenc->picture->data[c] = data + GST_VIDEO_INFO_COMP_OFFSET (info, c);
 -      ffmpegenc->picture->linesize[c] = GST_VIDEO_INFO_COMP_STRIDE (info, c);
 +      ffmpegenc->picture->data[c] = GST_VIDEO_FRAME_PLANE_DATA (&vframe, c);
 +      ffmpegenc->picture->linesize[c] =
-           GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, c);
++          GST_VIDEO_FRAME_COMP_STRIDE (&vframe, c);
      } else {
        ffmpegenc->picture->data[c] = NULL;
        ffmpegenc->picture->linesize[c] = 0;