diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
| commit | 2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b (patch) | |
| tree | a083736322f89e8a0440f52c82c0922fc084798f /libmpdemux | |
| parent | 2993acdc3118ec01274cf357336760443bfce561 (diff) | |
| parent | 59f2911c3ec64fcb9db8ac8e1216cf01506cac29 (diff) | |
| download | mpv-2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b.tar.bz2 mpv-2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b.tar.xz | |
Merge svn changes up to r26540
Conflicts:
Makefile
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/Makefile | 73 | ||||
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 2 |
2 files changed, 1 insertions, 74 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile deleted file mode 100644 index 5bd6338ca7..0000000000 --- a/libmpdemux/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libmpdemux.a -LIBNAME_MENCODER = libmpmux.a - -SRCS_COMMON = aac_hdr.c \ - asfheader.c \ - aviheader.c \ - aviprint.c \ - demuxer.c \ - demux_aac.c \ - demux_asf.c \ - demux_audio.c \ - demux_avi.c \ - demux_demuxers.c \ - demux_film.c \ - demux_fli.c \ - demux_lmlm4.c \ - demux_mf.c \ - demux_mkv.c ebml.c \ - demux_mov.c \ - demux_mpg.c \ - demux_nsv.c \ - demux_nuv.c \ - demux_pva.c \ - demux_rawaudio.c \ - demux_rawvideo.c \ - demux_realaud.c \ - demux_real.c \ - demux_roq.c \ - demux_smjpeg.c \ - demux_ts.c \ - demux_ty.c \ - demux_ty_osd.c \ - demux_viv.c \ - demux_vqf.c \ - demux_y4m.c \ - extension.c \ - mf.c \ - mp3_hdr.c \ - mp_taglists.c \ - mpeg_hdr.c \ - mpeg_packetizer.c \ - parse_es.c \ - parse_mp4.c \ - video.c \ - yuv4mpeg.c \ - yuv4mpeg_ratio.c \ - -SRCS_COMMON-$(GIF) += demux_gif.c -SRCS_COMMON-$(LIBAVFORMAT) += demux_lavf.c -SRCS_COMMON-$(LIBDV) += demux_rawdv.c -SRCS_COMMON-$(LIBNEMESI) += demux_nemesi.c -SRCS_COMMON-$(LIBNUT) += demux_nut.c -SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c -SRCS_COMMON-$(MUSEPACK) += demux_mpc.c -SRCS_COMMON-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp -SRCS_COMMON-$(WIN32DLL) += demux_avs.c -SRCS_COMMON-$(XMMS_PLUGINS) += demux_xmms.c - -SRCS_MENCODER = muxer.c \ - muxer_avi.c \ - muxer_mpeg.c \ - muxer_rawaudio.c \ - muxer_rawvideo.c \ - -SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c - -include ../mpcommon.mak - -demux_lavf.o mp_taglists.o .depend: CFLAGS += -I../libavcodec - -.depend: CFLAGS += $(EXTRAXX_INC) diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 7f9174d6a0..33b2dc41eb 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -6,7 +6,7 @@ extern "C" { #include <limits.h> #include <math.h> #include "stheader.h" -#include "base64.h" +#include "libavutil/base64.h" } #ifdef USE_LIBAVCODEC |