Release versions 1.2.11 and 1.2.11-1

[videolink.git] / generate_dvd.hpp

diff --git a/generate_dvd.hpp b/generate_dvd.hpp
index d7681630ccacacb84538aa485df4f0f06dcdd955..e1e3e3cf4f7f8bd6d4a3ea95e855239c89e3941b 100644 (file)
--- a/generate_dvd.hpp
+++ b/generate_dvd.hpp
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include <glibmm/refptr.h>
 
 #include "geometry.hpp"
@@ -51,12 +49,11 @@ public:
                            // unspecified; not compared!)
     };
 
-    // We can try using any of these encoders to convert PNG to MPEG.
+    // We can try using either of these encoders to convert PNG to MPEG.
     enum mpeg_encoder
     {
        mpeg_encoder_ffmpeg,         // ffmpeg
-       mpeg_encoder_mjpegtools_old, // mjpegtools before version 1.8
-       mpeg_encoder_mjpegtools_new  // mjpegtools from version 1.8
+       mpeg_encoder_mjpegtools      // mjpegtools from version 1.8
     };
 
     dvd_generator(const video::frame_params & frame_params,