From 47d4010afba7ad750b7cc3a3e36c342e704e462b Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sat, 3 Jan 2004 19:38:40 +0000
Subject: Update xvid plugin to latest xvid (1.0.0-beta3) API.

Original commit message from CVS:
2004-01-03  Ronald Bultje  <rbultje@ronald.bitfreak.net>

reviewed by: <delete if not using a buddy>

* configure.ac:
* ext/xvid/gstxvid.c: (gst_xvid_init), (gst_xvid_error),
(gst_xvid_structure_to_csp), (gst_xvid_csp_to_caps):
* ext/xvid/gstxvid.h:
* ext/xvid/gstxviddec.c: (gst_xviddec_class_init),
(gst_xviddec_init), (gst_xviddec_setup), (gst_xviddec_chain),
(gst_xviddec_src_link), (gst_xviddec_sink_link),
(gst_xviddec_change_state):
* ext/xvid/gstxviddec.h:
* ext/xvid/gstxvidenc.c: (gst_xvidenc_profile_get_type),
(gst_xvidenc_base_init), (gst_xvidenc_class_init),
(gst_xvidenc_init), (gst_xvidenc_setup), (gst_xvidenc_chain),
(gst_xvidenc_link), (gst_xvidenc_set_property),
(gst_xvidenc_get_property), (gst_xvidenc_change_state):
* ext/xvid/gstxvidenc.h:
Update xvid plugin to latest xvid (1.0.0-beta3) API.
---
 ext/xvid/gstxvid.h | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'ext/xvid/gstxvid.h')

diff --git a/ext/xvid/gstxvid.h b/ext/xvid/gstxvid.h
index 6e444f5f..100f93b8 100644
--- a/ext/xvid/gstxvid.h
+++ b/ext/xvid/gstxvid.h
@@ -1,4 +1,4 @@
-/* GStreamer xvid decoder plugin
+/* GStreamer xvid encoder/decoder plugin
  * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
  *
  * This library is free software; you can redistribute it and/or
@@ -22,15 +22,33 @@
 
 #include <gst/gst.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+
+#define gst_xvid_init_struct(s) \
+  do { \
+    memset (&s, 0, sizeof(s)); \
+    s.version = XVID_VERSION; \
+  } while (0);
+
+#define RGB_24_32_STATIC_CAPS(bpp, r_mask,g_mask,b_mask) \
+  "video/x-raw-rgb, " \
+  "width = (int) [ 0, MAX ], " \
+  "height = (int) [ 0, MAX], " \
+  "framerate = (double) [ 0.0, MAX], " \
+  "depth = (int) 24, " \
+  "bpp = (int) " G_STRINGIFY (bpp) ", " \
+  "endianness = (int) BIG_ENDIAN, " \
+  "red_mask = (int) " G_STRINGIFY (r_mask) ", " \
+  "green_mask = (int) " G_STRINGIFY (g_mask) ", " \
+  "blue_mask = (int) " G_STRINGIFY (b_mask)
 
 extern gchar *	gst_xvid_error (int errorcode);
 extern gboolean	gst_xvid_init  (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+extern gint     gst_xvid_structure_to_csp (GstStructure *structure,
+					   gint w, gint *stride, gint *bpp);
+extern GstCaps *gst_xvid_csp_to_caps      (gint csp, gint w, gint h, gdouble fps);
+
+G_END_DECLS
 
 #endif /* __GST_XVID_H__ */
-- 
cgit v1.2.1