summaryrefslogtreecommitdiff
path: root/src/libmpeg2
diff options
context:
space:
mode:
Diffstat (limited to 'src/libmpeg2')
-rw-r--r--src/libmpeg2/Makefile.am11
-rw-r--r--src/libmpeg2/xine_decoder.c9
2 files changed, 12 insertions, 8 deletions
diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am
index c6c6a1391..8eadd03a0 100644
--- a/src/libmpeg2/Makefile.am
+++ b/src/libmpeg2/Makefile.am
@@ -6,20 +6,19 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
libdir = $(XINE_PLUGINDIR)
-lib_LTLIBRARIES = xineplug_decode_mpeg2.la
+lib_LTLIBRARIES = xineplug_vo_dec_mpeg2.la
#libmpeg2_la_SOURCES = slice.c header.c stats.c idct.c motion_comp.c\
# decode.c idct_mmx.c motion_comp_mmx.c
-xineplug_decode_mpeg2_la_SOURCES = slice.c header.c stats.c idct.c motion_comp.c\
- decode.c idct_mmx.c motion_comp_mmx.c xine_decoder.c
-xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module
-
+xineplug_vo_dec_mpeg2_la_SOURCES = slice.c header.c stats.c idct.c \
+ motion_comp.c decode.c idct_mmx.c motion_comp_mmx.c xine_decoder.c
+xineplug_vo_dec_mpeg2_la_LDFLAGS = -avoid-version -module
noinst_HEADERS = vlc.h mpeg2.h mpeg2_internal.h
debug:
- $(MAKE) CFLAGS="$(DEBUG_CFLAGS) @BUILD_LIB_STATIC@"
+ $(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
mostlyclean-generic:
-rm -f *~ \#* .*~ .\#*
diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c
index a2f358b6d..9e8214d5e 100644
--- a/src/libmpeg2/xine_decoder.c
+++ b/src/libmpeg2/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.1 2001/04/23 00:34:59 guenter Exp $
+ * $Id: xine_decoder.c,v 1.2 2001/04/23 22:43:59 f1rmb Exp $
*
* stuff needed to turn libmpeg2 into a xine decoder plugin
*/
@@ -70,6 +70,10 @@ void mpeg2dec_close (video_decoder_t *this_gen) {
mpeg2_close (&this->mpeg2);
}
+static char *mpeg2dec_get_id(void) {
+ return "MPEG2DEC";
+}
+
video_decoder_t *init_video_decoder_plugin (int iface_version, config_values_t *cfg) {
mpeg2dec_decoder_t *this ;
@@ -85,7 +89,8 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, config_values_t *
this->video_decoder.decode_data = mpeg2dec_decode_data;
this->video_decoder.release_img_buffers = mpeg2dec_release_img_buffers;
this->video_decoder.close = mpeg2dec_close;
-
+ this->video_decoder.get_identifier = mpeg2dec_get_id;
+
return (video_decoder_t *) this;
}