Merge master.

[dcpomatic.git] / src / lib / transcode_job.cc

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index fd4dfcef6dfc10c89b699777514377b1b47820b2..97e8bd416a0432697b14dcb2503d6f82d62ba2e0 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -34,6 +34,7 @@ using std::string;
 using std::stringstream;
 using std::fixed;
 using std::setprecision;
+using std::cout;
 using boost::shared_ptr;
 
 /** @param s Film to use.
@@ -72,9 +73,6 @@ TranscodeJob::run ()
                _transcoder.reset ();
 
        } catch (...) {
-               set_progress (1);
-               set_state (FINISHED_ERROR);
-               _film->log()->log (N_("Transcode job failed or cancelled"));
                _transcoder.reset ();
                throw;
        }