diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-07-29 11:59:09 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-07-29 11:59:09 +0000 |
commit | 833a8b579b03c478de72f1d5e8aafb9b369380bd (patch) | |
tree | 27b9c58ca9173b3f8af52260cd2c96dbcbaf3f75 /ext/xvid/gstxviddec.c | |
parent | 0e115bc63918feb9973b10fd5066bae101a3113b (diff) | |
download | gst-plugins-bad-833a8b579b03c478de72f1d5e8aafb9b369380bd.tar.gz gst-plugins-bad-833a8b579b03c478de72f1d5e8aafb9b369380bd.tar.bz2 gst-plugins-bad-833a8b579b03c478de72f1d5e8aafb9b369380bd.zip |
call xvid_init() only once, and move duplicated code into one place
Original commit message from CVS:
call xvid_init() only once, and move duplicated code into one place
Diffstat (limited to 'ext/xvid/gstxviddec.c')
-rw-r--r-- | ext/xvid/gstxviddec.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c index a5888da8..50e72a3c 100644 --- a/ext/xvid/gstxviddec.c +++ b/ext/xvid/gstxviddec.c @@ -135,23 +135,8 @@ static void gst_xviddec_class_init (GstXvidDecClass *klass) { GObjectClass *gobject_class = (GObjectClass *) klass; - XVID_INIT_PARAM xinit; - gint ret; - - /* set up xvid initially (function pointers, CPU flags) */ - memset(&xinit, 0, sizeof(XVID_INIT_PARAM)); - xinit.cpu_flags = 0; - if ((ret = xvid_init(NULL, 0, &xinit, NULL)) != XVID_ERR_OK) { - g_warning("Failed to initialize XviD: %s (%d)", - gst_xvid_error(ret), ret); - return; - } - - if (xinit.api_version != API_VERSION) { - g_warning("Xvid API version mismatch! %d.%d (that's us) != %d.%d (lib)", - (API_VERSION >> 8) & 0xff, API_VERSION & 0xff, - (xinit.api_version >> 8) & 0xff, xinit.api_version & 0xff); - } + + gst_xvid_init(); parent_class = g_type_class_ref(GST_TYPE_ELEMENT); |