summaryrefslogtreecommitdiff
path: root/src/lib/decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-24 22:13:53 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-24 22:13:53 +0100
commit63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch)
treed248762556466fd076cfd20f2e6aa1d5d9544184 /src/lib/decoder.cc
parent977b36672892b14de4ecb68e98415c64946e8a93 (diff)
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/lib/decoder.cc')
-rw-r--r--src/lib/decoder.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 9c339737a..f6ddfbeff 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -49,8 +49,10 @@ extern "C" {
#include "ffmpeg_compatibility.h"
#include "subtitle.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::min;
+using boost::shared_ptr;
/** @param f Film.
* @param o Options.