diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-09 19:35:44 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-09 19:35:44 +0000 |
commit | ad978de549f9d227326f54b1e8903f8c270d7e94 (patch) | |
tree | 33b7af57b7a2b54b06557e2888fdd641e1e612fc /libmpdemux | |
parent | 0355c449220c676542d1cdf5ace47a57d0c59fe9 (diff) | |
download | mpv-ad978de549f9d227326f54b1e8903f8c270d7e94.tar.bz2 mpv-ad978de549f9d227326f54b1e8903f8c270d7e94.tar.xz |
added support for external libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 8 | ||||
-rw-r--r-- | libmpdemux/demux_lavf.c | 7 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
-rw-r--r-- | libmpdemux/muxer.c | 2 | ||||
-rw-r--r-- | libmpdemux/muxer_lavf.c | 4 |
5 files changed, 18 insertions, 7 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 62e65e6c97..12fb6b6f0a 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -64,7 +64,6 @@ SRCS += demuxer.c \ demux_film.c \ demux_fli.c \ demux_gif.c \ - demux_lavf.c \ demux_lmlm4.c \ demux_mf.c \ demux_mov.c \ @@ -117,7 +116,12 @@ LIBAV_INC += -I../libavcodec endif ifeq ($(CONFIG_LIBAVFORMAT),yes) LIBAV_INC += -I../libavformat -SRCS += muxer_lavf.c +SRCS += demux_lavf.c \ + muxer_lavf.c +endif +ifeq ($(CONFIG_LIBAVFORMAT_SO),yes) +SRCS += demux_lavf.c \ + muxer_lavf.c endif ifeq ($(MPLAYER_NETWORK),yes) diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index c31a0a9114..d6cbc55503 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -28,10 +28,12 @@ #include "demuxer.h" #include "stheader.h" -#ifdef USE_LIBAVFORMAT - +#ifdef USE_LIBAVFORMAT_SO +#include <ffmpeg/avformat.h> +#else #include "avformat.h" #include "avi.h" +#endif #define PROBE_BUF_SIZE 2048 @@ -451,4 +453,3 @@ demuxer_desc_t demuxer_desc_lavf = { demux_lavf_control }; -#endif // USE_LIBAVFORMAT diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index f54a6532b1..3cd17519a7 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -62,7 +62,9 @@ extern demuxer_desc_t demuxer_desc_audio; extern demuxer_desc_t demuxer_desc_xmms; extern demuxer_desc_t demuxer_desc_mpeg_ty; extern demuxer_desc_t demuxer_desc_rtp; +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) extern demuxer_desc_t demuxer_desc_lavf; +#endif extern demuxer_desc_t demuxer_desc_aac; demuxer_desc_t* demuxer_list[] = { @@ -119,7 +121,7 @@ demuxer_desc_t* demuxer_list[] = { #ifdef STREAMING_LIVE555 &demuxer_desc_rtp, #endif -#ifdef USE_LIBAVFORMAT +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) &demuxer_desc_lavf, #endif &demuxer_desc_aac, diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index fa2574c50e..e2da4efa3b 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -35,7 +35,7 @@ muxer_t *muxer_new_muxer(int type,FILE *f){ if(! muxer_init_muxer_rawaudio(muxer)) return NULL; break; -#ifdef USE_LIBAVFORMAT +#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) case MUXER_TYPE_LAVF: if(! muxer_init_muxer_lavf(muxer)) return NULL; diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 55a8a4c7ef..88d08d36ee 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -17,7 +17,11 @@ #include "demuxer.h" #include "stheader.h" #include "m_option.h" +#ifdef USE_LIBAVFORMAT_SO +#include <ffmpeg/avformat.h> +#else #include "avformat.h" +#endif extern unsigned int codec_get_wav_tag(int id); extern enum CodecID codec_get_bmp_id(unsigned int tag); |