summaryrefslogtreecommitdiff
path: root/src/lib/transcoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-08-29 14:50:55 +0100
committerCarl Hetherington <cth@carlh.net>2013-08-29 14:50:55 +0100
commitb8724f408298ff3e804fb821fa15d3bcded0e3db (patch)
tree6b551ad6a7bc2845f105a5f44bc5151d9e600d1a /src/lib/transcoder.h
parente60d69b3462755c5f98a460688d391822fdc62fb (diff)
parent11619ba7fd5537407798c01c6ca299fb64422338 (diff)
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'src/lib/transcoder.h')
-rw-r--r--src/lib/transcoder.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 007065b65..7bf214a88 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,12 +18,7 @@
*/
#include "types.h"
-
-/** @file src/transcoder.h
- *
- * A decoder is selected according to the content type, and the encoder can be specified
- * as a parameter to the constructor.
- */
+#include "encoder.h"
class Film;
class Job;
@@ -31,11 +26,7 @@ class Encoder;
class VideoFilter;
class Player;
-/** @class Transcoder
- *
- * A decoder is selected according to the content type, and the encoder can be specified
- * as a parameter to the constructor.
- */
+/** @class Transcoder */
class Transcoder : public boost::noncopyable
{
public:
@@ -47,6 +38,7 @@ public:
void go ();
float current_encoding_rate () const;
+ Encoder::State state () const;
int video_frames_out () const;
private: