diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
| commit | 0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch) | |
| tree | 075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /src/lib/transcode_job.h | |
| parent | 42a122334d594b824c666e5263168386a76801cc (diff) | |
| parent | 016a98b18d01276a1e603885a25785e7389f14d9 (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'src/lib/transcode_job.h')
| -rw-r--r-- | src/lib/transcode_job.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h index 6e3c1ead9..9128206d2 100644 --- a/src/lib/transcode_job.h +++ b/src/lib/transcode_job.h @@ -35,7 +35,6 @@ public: TranscodeJob (boost::shared_ptr<const Film> f); std::string name () const; - std::string json_name () const; void run (); std::string status () const; |