summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2008-06-28 20:51:36 +0000
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2008-06-28 20:51:36 +0000
commita1b7dde06923100706cbf47480d6d5e59dfb62fe (patch)
treed8e1b24c9034ade4554e28dfeb3c3f4815581847 /ext
parent4b2e3dd2107bd42f7ac20489305c6e4e363dcb41 (diff)
downloadgst-plugins-bad-a1b7dde06923100706cbf47480d6d5e59dfb62fe.tar.gz
gst-plugins-bad-a1b7dde06923100706cbf47480d6d5e59dfb62fe.tar.bz2
gst-plugins-bad-a1b7dde06923100706cbf47480d6d5e59dfb62fe.zip
ext/mpeg2enc/gstmpeg2encoptions.*: Expose the additional MPEG HDTV format profiles available in latest mjpegtools ver...
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.
Diffstat (limited to 'ext')
-rw-r--r--ext/mpeg2enc/gstmpeg2encoptions.cc26
-rw-r--r--ext/mpeg2enc/gstmpeg2encoptions.hh1
2 files changed, 17 insertions, 10 deletions
diff --git a/ext/mpeg2enc/gstmpeg2encoptions.cc b/ext/mpeg2enc/gstmpeg2encoptions.cc
index 875c452c..aca974cc 100644
--- 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 ccacd951..ab2529f7 100644
--- 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 {