ext/mpeg2enc/gstmpeg2encoptions.*: Expose the additional MPEG HDTV format profiles...

Original commit message from CVS:
* ext/mpeg2enc/gstmpeg2encoptions.cc:
* ext/mpeg2enc/gstmpeg2encoptions.hh:
Expose the additional MPEG HDTV format profiles available in latest
mjpegtools version.

diff --git a/ChangeLog b/ChangeLog
index c66b754..e8cf6f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-28  Mark Nauwelaerts  <mark.nauwelaerts@collabora.co.uk>
+
+       * ext/mpeg2enc/gstmpeg2encoptions.cc:
+       * ext/mpeg2enc/gstmpeg2encoptions.hh:
+       Expose the additional MPEG HDTV format profiles available in latest
+       mjpegtools version.
+
 2008-06-28  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * gst/deinterlace2/gstdeinterlace2.c: (gst_deinterlace2_src_query):

diff --git a/ext/mpeg2enc/gstmpeg2encoptions.cc b/ext/mpeg2enc/gstmpeg2encoptions.cc
index 875c452..aca974c 100644 (file)
--- a/ext/mpeg2enc/gstmpeg2encoptions.cc
+++ b/ext/mpeg2enc/gstmpeg2encoptions.cc
@@ -88,16 +88,22 @@ gst_mpeg2enc_format_get_type (void)
 
   if (!mpeg2enc_format_type) {
     static const GEnumValue mpeg2enc_formats[] = {
-      {0, "Generic MPEG-1", "0"},
-      {1, "Standard VCD", "1"},
-      {2, "User VCD", "2"},
-      {3, "Generic MPEG-2", "3"},
-      {4, "Standard SVCD", "4"},
-      {5, "User SVCD", "5"},
-      {6, "VCD Stills sequences", "6"},
-      {7, "SVCD Stills sequences", "7"},
-      {8, "DVD MPEG-2 for dvdauthor", "8"},
-      {9, "DVD MPEG-2", "9"},
+      {MPEG_FORMAT_MPEG1, "Generic MPEG-1", "0"},
+      {MPEG_FORMAT_VCD, "Standard VCD", "1"},
+      {MPEG_FORMAT_VCD_NSR, "User VCD", "2"},
+      {MPEG_FORMAT_MPEG2, "Generic MPEG-2", "3"},
+      {MPEG_FORMAT_SVCD, "Standard SVCD", "4"},
+      {MPEG_FORMAT_SVCD_NSR, "User SVCD", "5"},
+      {MPEG_FORMAT_VCD_STILL, "VCD Stills sequences", "6"},
+      {MPEG_FORMAT_SVCD_STILL, "SVCD Stills sequences", "7"},
+      {MPEG_FORMAT_DVD_NAV, "DVD MPEG-2 for dvdauthor", "8"},
+      {MPEG_FORMAT_DVD, "DVD MPEG-2", "9"},
+#ifdef MPEG_FORMAT_ATSC1080i
+      {MPEG_FORMAT_ATSC480i, "ATSC 480i", "10"},
+      {MPEG_FORMAT_ATSC480p, "ATSC 480p", "11"},
+      {MPEG_FORMAT_ATSC720p, "ATSC 720p", "12"},
+      {MPEG_FORMAT_ATSC1080i, "ATSC 1080i", "13"},
+#endif
       {0, NULL, NULL},
     };
 

diff --git a/ext/mpeg2enc/gstmpeg2encoptions.hh b/ext/mpeg2enc/gstmpeg2encoptions.hh
index ccacd95..ab2529f 100644 (file)
--- a/ext/mpeg2enc/gstmpeg2encoptions.hh
+++ b/ext/mpeg2enc/gstmpeg2encoptions.hh
@@ -23,6 +23,7 @@
 #define __GST_MPEG2ENCOPTIONS_H__
 
 #include <glib-object.h>
+#include <format_codes.h>
 #include <mpeg2encoptions.hh>
 
 class GstMpeg2EncOptions : public MPEG2EncOptions {