Hand-apply 6fc77d362ee50747d0ff1626720ccd6d3704d9a4 from master; comment fix.

diff --git a/TO_PORT b/TO_PORT
index 4818d253adee54801ed12303f90cfe5187b6e283..494945e9629062ae426fc99117ef622d66f3b633 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,3 +1,2 @@
-c8926dcc6cb327ddf4796bf2bfe17d65c75940e5
 0ee1e8c65e2977638375a8f96dbea201210aac98
 f2851b7066d0e12102b0f3aabc2b827a261206a9

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 5718a05b4bc2852d65ee3325e405b0389f6467bc..8aed205741ec9aaf454ec70026a4b70d68bdaaba 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -42,9 +42,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
-/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
+/** Construct a transcoder.
  *  @param f Film that we are transcoding.
- *  @param e Encoder to use.
+ *  @param j Job that this transcoder is being used in.
  */
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
        : _film (f)