summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-05-11 18:29:07 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-05-11 18:29:07 +0000
commit598c7fd57627a1753219435e2097fd1d274506d7 (patch)
treea99c5368d9045faa985d78ea29cb3a9c522b066e /libmpcodecs
parentffc479f7460c53cc0eaeb389935d78bb8b20eb3b (diff)
downloadmpv-598c7fd57627a1753219435e2097fd1d274506d7.tar.bz2
mpv-598c7fd57627a1753219435e2097fd1d274506d7.tar.xz
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng@gmx.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10096 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/Makefile2
-rw-r--r--libmpcodecs/vd.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 2eff8a6b5f..81d5caf11c 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -11,7 +11,7 @@ AUDIO_SRCS=dec_audio.c ad.c $(AUDIO_SRCS_LIB) $(AUDIO_SRCS_NAT) $(AUDIO_SRCS_OPT
VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c
VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_lcl.c vd_mtga.c vd_sgi.c
-VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c
+VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c vd_theora.c
VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 8a14f4ec8b..3646ce07c6 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -2,6 +2,8 @@
#include <stdlib.h>
#include <string.h>
+#define USE_THEORA
+
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
@@ -29,6 +31,7 @@ extern vd_functions_t mpcodecs_vd_null;
extern vd_functions_t mpcodecs_vd_cinepak;
extern vd_functions_t mpcodecs_vd_qtrpza;
extern vd_functions_t mpcodecs_vd_ffmpeg;
+extern vd_functions_t mpcodecs_vd_theora;
extern vd_functions_t mpcodecs_vd_dshow;
extern vd_functions_t mpcodecs_vd_dmo;
extern vd_functions_t mpcodecs_vd_vfw;
@@ -67,6 +70,9 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
#ifdef USE_LIBAVCODEC
&mpcodecs_vd_ffmpeg,
#endif
+#ifdef HAVE_OGGTHEORA
+ &mpcodecs_vd_theora,
+#endif
#ifdef USE_WIN32DLL
#ifdef USE_DIRECTSHOW
&mpcodecs_vd_dshow,