diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-11 22:39:20 +0100 |
| commit | cc27c2716f755305d67f1e1ba828ecf37f8405dd (patch) | |
| tree | 224d2b1c469bc671e6b826e8a535f61f6459bc81 /src/lib/ffmpeg_decoder.cc | |
| parent | 4ddf91dda7d84f169e4b905fd41cf747f4a0102c (diff) | |
| parent | 491daf8790f35611052d8954d5d74df275dcda18 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 0f2c88fc9..4e5d9bb1e 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -56,7 +56,6 @@ extern "C" { using std::cout; using std::string; using std::vector; -using std::stringstream; using std::list; using std::min; using std::pair; |