diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:49:27 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-12-30 11:49:27 +0100 |
| commit | 4917e16458a7e59797e43ace5373a10c5bcc6925 (patch) | |
| tree | 3bab2357e614718bf6a8d022f4fba3429a689604 /gst/camerabin2 | |
| parent | f70a623418a52eada0278002f8d266d49957b3d5 (diff) | |
| parent | 51f399686eb172baf7b27b300b8b84869fdb85fa (diff) | |
| download | gstreamer-plugins-bad-4917e16458a7e59797e43ace5373a10c5bcc6925.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
tests/examples/camerabin2/Makefile.am
Diffstat (limited to 'gst/camerabin2')
| -rw-r--r-- | gst/camerabin2/gstcamerabin2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c index 12c52b0a2..ad22826f3 100644 --- a/gst/camerabin2/gstcamerabin2.c +++ b/gst/camerabin2/gstcamerabin2.c @@ -1688,7 +1688,7 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera) NULL); if (camera->video_profile_switch) { - GST_DEBUG_OBJECT (camera, "Switching encodebin's profile"); + GST_DEBUG_OBJECT (camera, "Switching video-encodebin's profile"); g_object_set (camera->video_encodebin, "profile", camera->video_profile, NULL); if (GST_PAD_LINK_FAILED (gst_camera_bin_link_encodebin (camera, @@ -1703,7 +1703,7 @@ gst_camera_bin_create_elements (GstCameraBin2 * camera) } if (camera->image_profile_switch) { - GST_DEBUG_OBJECT (camera, "Switching encodebin's profile"); + GST_DEBUG_OBJECT (camera, "Switching image-encodebin's profile"); g_object_set (camera->image_encodebin, "profile", camera->image_profile, NULL); if (GST_PAD_LINK_FAILED (gst_camera_bin_link_encodebin (camera, |