From 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Oct 2012 22:13:53 +0100
Subject: Use boost::signals2; fix bugs with x-thread signalling.

---
 src/lib/ffmpeg_decoder.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg_decoder.cc')

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 30701797a..b6cdce0e4 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -49,10 +49,12 @@ extern "C" {
 #include "ffmpeg_decoder.h"
 #include "subtitle.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::vector;
+using std::stringstream;
+using boost::shared_ptr;
 
-FFmpegDecoder::FFmpegDecoder (boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, bool minimal, bool ignore_length)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal, bool ignore_length)
 	: Decoder (f, o, j, minimal, ignore_length)
 	, _format_context (0)
 	, _video_stream (-1)
-- 
cgit v1.2.3