X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscaler.h;h=a736e92de0a269b37821fa51b725845c4872bca3;hb=01791aac0b11e9f296cd31a7803e287203bd8355;hp=d5a83f732b12d6dd7f7322037e464e380886c99f;hpb=5d0f01f04f85280a562ac9da8f58ad0c3489f7aa;p=dcpomatic.git

diff --git a/src/lib/scaler.h b/src/lib/scaler.h
index d5a83f732..a736e92de 100644
--- a/src/lib/scaler.h
+++ b/src/lib/scaler.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's software scalers.
  */
 
-#ifndef DVDOMATIC_SCALER_H
-#define DVDOMATIC_SCALER_H
+#ifndef DCPOMATIC_SCALER_H
+#define DCPOMATIC_SCALER_H
 
 #include <string>
 #include <vector>
@@ -33,18 +33,13 @@
 class Scaler
 {
 public:
-	Scaler (int f, int m, std::string i, std::string n);
+	Scaler (int f, std::string i, std::string n);
 
 	/** @return id used for calls to FFmpeg's pp_postprocess */
 	int ffmpeg_id () const {
 		return _ffmpeg_id;
 	}
 
-	/** @return number to use on an mplayer command line */
-	int mplayer_id () const {
-		return _mplayer_id;
-	}
-
 	/** @return id for our use */
 	std::string id () const {
 		return _id;
@@ -65,7 +60,6 @@ private:
 
 	/** id used for calls to FFmpeg's pp_postprocess */
 	int _ffmpeg_id;
-	int _mplayer_id;
 	/** id for our use */
 	std::string _id;
 	/** user-visible name for this scaler */