diff options
| -rw-r--r-- | src/libreal/audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/libreal/xine_decoder.c | 4 | ||||
| -rw-r--r-- | src/libw32dll/qt_decoder.c | 10 | ||||
| -rw-r--r-- | src/libw32dll/w32codec.c | 14 |
4 files changed, 12 insertions, 20 deletions
diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c index 8f87b3e80..b6e8045ee 100644 --- a/src/libreal/audio_decoder.c +++ b/src/libreal/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.17 2003/01/02 20:02:15 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.18 2003/01/03 23:18:13 miguelfreitas Exp $ * * thin layer to use real binary-only codecs in xine * @@ -761,6 +761,6 @@ static decoder_info_t dec_info_audio = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_DECODER, 13, "realadec", XINE_VERSION_CODE, &dec_info_audio, init_class }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 13, "realadec", XINE_VERSION_CODE, &dec_info_audio, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c index c0fe5bf18..101eca073 100644 --- a/src/libreal/xine_decoder.c +++ b/src/libreal/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.25 2003/01/02 20:02:15 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.26 2003/01/03 23:18:13 miguelfreitas Exp $ * * thin layer to use real binary-only codecs in xine * @@ -619,6 +619,6 @@ static decoder_info_t dec_info_real = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 14, "real", XINE_VERSION_CODE, &dec_info_real, init_class }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 14, "real", XINE_VERSION_CODE, &dec_info_real, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index d012d9623..77fb92efc 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: qt_decoder.c,v 1.6 2003/01/01 20:39:20 guenter Exp $ + * $Id: qt_decoder.c,v 1.7 2003/01/03 23:18:13 miguelfreitas Exp $ * * quicktime video/audio decoder plugin, using win32 dlls * most of this code comes directly from MPlayer @@ -1149,12 +1149,12 @@ static void *qtv_init_class (xine_t *xine, void *data) { _("path to win32 codec dlls"), NULL, 0, NULL, NULL); +#ifdef LOG printf ("qtv_init_class...\n"); +#endif pthread_once (&once_control, init_routine); - printf ("qtv_init_class... done\n"); - this = (qtv_class_t *) xine_xmalloc (sizeof (qtv_class_t)); this->decoder_class.open_plugin = qtv_open_plugin; @@ -1178,8 +1178,8 @@ static decoder_info_t qtv_dec_info = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 14, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class }, - { PLUGIN_AUDIO_DECODER, 13, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 14, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 13, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index b4bfa85be..25c39510a 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: w32codec.c,v 1.112 2002/12/23 16:09:28 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.113 2003/01/03 23:18:13 miguelfreitas Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -1489,10 +1489,6 @@ static void *init_video_decoder_class (xine_t *xine, void *data) { pthread_once (&once_control, init_routine); -#ifdef SYNC_SHUTDOWN - w32v_instance = NULL; -#endif - return this; } @@ -1558,10 +1554,6 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) { pthread_once (&once_control, init_routine); -#ifdef SYNC_SHUTDOWN - w32a_instance = NULL; -#endif - return this; } @@ -1599,7 +1591,7 @@ static decoder_info_t dec_info_audio = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_DECODER, 14, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class }, - { PLUGIN_AUDIO_DECODER, 13, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class }, + { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 14, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class }, + { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 13, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |