refresh frame fix, dblclk proxy viewer fix, vicon refresh fix for awdw resize, fix...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / interlacemodes.C

diff --git a/cinelerra-5.1/cinelerra/interlacemodes.C b/cinelerra-5.1/cinelerra/interlacemodes.C
index f9b0b3b6300eb92c13f135db625c414a4fc80a08..cb2c74d6e1e4f239a58cd2b2ddc8428dfc336617 100644 (file)
--- a/cinelerra-5.1/cinelerra/interlacemodes.C
+++ b/cinelerra-5.1/cinelerra/interlacemodes.C
@@ -3,15 +3,15 @@
  * under the terms of the GNU Lesser General Public License as published
  * by the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
 
@@ -23,7 +23,12 @@
 #define HAVE_STDINT_H
 #endif /* HAVE_STDINT_H */
 
-#include "mjpegtools/yuv4mpeg.h"
+#define Y4M_UNKNOWN -1
+#define Y4M_ILACE_NONE          0   /* non-interlaced, progressive frame */
+#define Y4M_ILACE_TOP_FIRST     1   /* interlaced, top-field first       */
+#define Y4M_ILACE_BOTTOM_FIRST  2   /* interlaced, bottom-field first    */
+#define Y4M_ILACE_MIXED         3   /* mixed, "refer to frame header"    */
+
 #include "interlacemodes.h"
 
 // AUTO FIX METHOD ====================
@@ -111,7 +116,7 @@ int ilacefixmethod_from_text(const char *text, int thedefault)
        if(!strcasecmp(text, _(ILACE_FIXMETHOD_NONE_T)))        return ILACE_FIXMETHOD_NONE;
        if(!strcasecmp(text, _(ILACE_FIXMETHOD_UPONE_T)))       return ILACE_FIXMETHOD_UPONE;
        if(!strcasecmp(text, _(ILACE_FIXMETHOD_DOWNONE_T)))     return ILACE_FIXMETHOD_DOWNONE;
-       return thedefault; 
+       return thedefault;
 }
 
 void ilacefixmethod_to_xmltext(char *string, int fixmethod)
@@ -129,10 +134,10 @@ int ilacefixmethod_from_xmltext(const char *text, int thedefault)
        if(!strcasecmp(text, ILACE_FIXMETHOD_NONE_XMLT))        return ILACE_FIXMETHOD_NONE;
        if(!strcasecmp(text, ILACE_FIXMETHOD_UPONE_XMLT))       return ILACE_FIXMETHOD_UPONE;
        if(!strcasecmp(text, ILACE_FIXMETHOD_DOWNONE_XMLT))     return ILACE_FIXMETHOD_DOWNONE;
-       return thedefault; 
+       return thedefault;
 }
 
-int  ilaceautofixmethod(int projectmode, int assetmode) 
+int  ilaceautofixmethod(int projectmode, int assetmode)
 {
        if (projectmode == assetmode)
                return ILACE_FIXMETHOD_NONE;