diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-12 09:51:25 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-12 09:51:25 +0000 |
| commit | 4eebe7dc88a890f5ee6167c58975031adceca07b (patch) | |
| tree | 3edd3630f500232bb85301b748285f6cc82f6378 | |
| parent | acb11de6b9429226e9ccb4a344914cbd0f322548 (diff) | |
| download | mpv-4eebe7dc88a890f5ee6167c58975031adceca07b.tar.bz2 mpv-4eebe7dc88a890f5ee6167c58975031adceca07b.tar.xz | |
Revert libnut option names, the issue is fixed in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22208 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7542,7 +7542,7 @@ ZORAN = $_zr LIBDV = $_libdv XVID4 = $_xvid X264 = $_x264 -CONFIG_LIBNUT = $_nut +LIBNUT = $_nut CONFIG_LIBDTS = $_libdts MPLAYER = $_mplayer MENCODER = $_mencoder diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 254632277f..96c41faf57 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -52,7 +52,7 @@ SRCS-$(CONFIG_LIBAVFORMAT) += demux_lavf.c SRCS-$(CONFIG_LIBAVFORMAT_SO) += demux_lavf.c SRCS-$(GIF) += demux_gif.c SRCS-$(LIBDV) += demux_rawdv.c -SRCS-$(CONFIG_LIBNUT) += demux_nut.c +SRCS-$(LIBNUT) += demux_nut.c SRCS-$(LIBVORBIS) += demux_ogg.c SRCS-$(MUSEPACK) += demux_mpc.c SRCS-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp |