From a4f13fb2be6e25d26a82b7931241d860a4e438fd Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 24 May 2003 10:30:37 +0000 Subject: [PATCH] - moved functionality of GST_FORMAT_UNITS to GST_FORMAT_DEFAULT, the old _DEFAULT functionality was ambigous; now the... Original commit message from CVS: - moved functionality of GST_FORMAT_UNITS to GST_FORMAT_DEFAULT, the old _DEFAULT functionality was ambigous; now the _DEFAULT format is media specific (frames for video, samples for audio, ...) --- gst/gstformat.c | 3 +-- gst/gstformat.h | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gst/gstformat.c b/gst/gstformat.c index 353ffe5..b5dd331 100644 --- a/gst/gstformat.c +++ b/gst/gstformat.c @@ -32,12 +32,11 @@ static GHashTable *_format_to_nick = NULL; static gint _n_values = 1; /* we start from 1 because 0 reserved for UNDEFINED */ static GstFormatDefinition standard_definitions[] = { - { GST_FORMAT_DEFAULT, "default", "Default" }, + { GST_FORMAT_DEFAULT, "default", "Default format for the media type" }, { GST_FORMAT_BYTES, "bytes", "Bytes" }, { GST_FORMAT_TIME, "time", "Time" }, { GST_FORMAT_BUFFERS, "buffers", "Buffers" }, { GST_FORMAT_PERCENT, "percent", "Percent" }, - { GST_FORMAT_UNITS, "units", "Units as defined by the media type" }, { 0, NULL, NULL } }; diff --git a/gst/gstformat.h b/gst/gstformat.h index 9af0a45..20bb286 100644 --- a/gst/gstformat.h +++ b/gst/gstformat.h @@ -31,13 +31,11 @@ G_BEGIN_DECLS typedef enum { GST_FORMAT_UNDEFINED = 0, /* must be first in list */ - GST_FORMAT_DEFAULT = 1, + GST_FORMAT_DEFAULT = 1, /* samples for audio, frames/fields for video */ GST_FORMAT_BYTES = 2, GST_FORMAT_TIME = 3, GST_FORMAT_BUFFERS = 4, GST_FORMAT_PERCENT = 5, - /* samples for audio, frames/fields for video */ - GST_FORMAT_UNITS = 6 } GstFormat; /* a percentage is always relative to 1000000 */ -- 2.7.4