Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gst-plugins-good.git] / gst / rtp / gstrtpjpegdepay.h

diff --git a/gst/rtp/gstrtpjpegdepay.h b/gst/rtp/gstrtpjpegdepay.h
index f6a3bb6..0b97570 100644 (file)
--- a/gst/rtp/gstrtpjpegdepay.h
+++ b/gst/rtp/gstrtpjpegdepay.h
@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstadapter.h>
-#include <gst/rtp/gstbasertpdepayload.h>
+#include <gst/rtp/gstrtpbasedepayload.h>
 
 G_BEGIN_DECLS
 
@@ -42,19 +42,27 @@ typedef struct _GstRtpJPEGDepayClass GstRtpJPEGDepayClass;
 
 struct _GstRtpJPEGDepay
 {
-  GstBaseRTPDepayload depayload;
+  GstRTPBaseDepayload depayload;
 
   GstAdapter *adapter;
+  gboolean    discont;
 
   /* cached quant tables */
   guint8 * qtables[255];
+  gint frate_num;
+  gint frate_denom;
+  gint media_width;
+  gint media_height;
+  gint width, height;
 };
 
 struct _GstRtpJPEGDepayClass
 {
-  GstBaseRTPDepayloadClass parent_class;
+  GstRTPBaseDepayloadClass parent_class;
 };
 
+GType gst_rtp_jpeg_depay_get_type (void);
+
 gboolean gst_rtp_jpeg_depay_plugin_init (GstPlugin * plugin);
 
 G_END_DECLS