From 43ae996b3a18ecad15f6fe872c4194d23b2200cf Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 3 Aug 2013 16:54:57 +0200
Subject: dedicated namespace for video-utils

conflicting symbol prophylaxis
---
 gtk2_ardour/video_image_frame.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gtk2_ardour/video_image_frame.cc')

diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc
index 3c39dea77b..38a7a5994f 100644
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -36,6 +36,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace VideoUtils;
 
 VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent, int w, int h, std::string vsurl, std::string vfn)
 	: editor (ed)
@@ -196,7 +197,7 @@ http_get_thread (void *arg) {
 	int timeout = 1000; // * 5ms -> 5sec
 	char *res = NULL;
 	do {
-		res=curl_http_get(url, &status);
+		res=a3_curl_http_get(url, &status);
 		if (status == 503) usleep(5000); // try-again
 	} while (status == 503 && --timeout > 0);
 
-- 
cgit v1.2.3