Date:2011-04-24 21:27:53 (12 years 11 months ago)
Author:David Kühling
Commit:ffb6f8b339b1ce0e0d967116c0a2dd8863096458
Message:Disable (all?) patented codecs. Disable ffmpeg's (broken) ogg demuxer.

Files: mplayer/Makefile (2 diffs)
mplayer/README (1 diff)
mplayer/patches/015-patentparanoia.patch (1 diff)

Change Details

mplayer/Makefile
6969          --prefix=/usr \
7070          --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config \
7171          --with-freetype-config=$(STAGING_DIR)/host/bin/freetype-config \
72          --enable-rpath \
73          --extra-cflags="-I$(STAGING_DIR)/usr/include/directfb \
74          $(ICONV_CPPFLAGS)" \
75          --extra-ldflags="$(ICONV_LDFLAGS)" \
76          --host-cc=gcc \
77          --enable-fbdev \
78          --confdir=/usr/share/mplayer \
79          --enable-menu \
80          --$(if $(CONFIG_BUILD_PATENTED),enable-mad,disable-mad) \
81          --$(if $(CONFIG_BUILD_PATENTED),enable-mp3lib,disable-mp3lib) \
82          --disable-x11 \
83          --disable-xv \
84          --disable-vm \
85          --disable-vdpau \
86          --disable-gl \
87          --disable-xf86keysym \
88          --enable-vidix \
89          --disable-vidix-pcidb \
90          --with-vidix-drivers="no"
72          --enable-rpath \
73          --extra-cflags="-I$(STAGING_DIR)/usr/include/directfb \
74          $(ICONV_CPPFLAGS)" \
75          --extra-ldflags="$(ICONV_LDFLAGS)" \
76          --host-cc=gcc \
77          --enable-fbdev \
78          --confdir=/usr/share/mplayer \
79          --enable-menu \
80          --disable-x11 \
81          --disable-xv \
82          --disable-vm \
83          --disable-vdpau \
84          --disable-gl \
85          --disable-xf86keysym \
86          --enable-vidix \
87          --disable-vidix-pcidb \
88          --with-vidix-drivers="no" \
89              --enable-tremor-internal \
90          --enable-decoder=RAWVIDEO_DECODER \
91          --enable-decoder=THEORA_DECODER \
92          --enable-decoder=VP3_DECODER \
93          --enable-decoder=VP8_DECODER \
94          --enable-decoder=MP2_DECODER \
95          --enable-decoder=FLAC_DECODER \
96          --enable-decoder=PCM_U8_DECODER \
97          --enable-decoder=PCM_U16BE_DECODER \
98          --enable-decoder=PCM_U16LE_DECODER \
99          --enable-decoder=PCM_S8_DECODER \
100          --enable-decoder=PCM_S16BE_DECODER \
101          --enable-decoder=PCM_S16LE_DECODER \
102          --enable-decoder=PCM_MULAW_DECODER \
103          --enable-decoder=PCM_ALAW_DECODER \
104          --enable-demuxer=RAWVIDEO_DEMUXER \
105          --enable-demuxer=AVI_DEMUXER \
106          --enable-demuxer=FLAC_DEMUXER \
107          --enable-demuxer=MATROSKA_DEMUXER \
108          --enable-demuxer=MATROSKA_AUDIO_DEMUXER \
109          --enable-demuxer=SRT_DEMUXER \
110          --enable-demuxer=WAV_DEMUXER \
111          --enable-demuxer=YUV4MPEGPIPE_DEMUXER \
112          --enable-parser=VP3_PARSER \
113          --enable-parser=VP8_PARSER \
114          --enable-parser=PNM_PARSER \
115          --enable-parser=DIRAC_PARSER \
116          --enable-parser=FLAC_PARSER \
117          --enable-protocol=HTTP_PROTOCOL \
118          --enable-protocol=CONCAT_PROTOCOL \
119          --enable-protocol=FILE_PROTOCOL \
120          --enable-protocol=PIPE_PROTOCOL \
121          --enable-protocol=TCP_PROTOCOL \
122          --enable-protocol=UDP_PROTOCOL
123
124# cannot enable, pulls in mpegts, and realmedia stuff (?):
125# --enable-protocol=RTP_PROTOCOL
126
127# not compiling working with libspeex version from openwrt:
128# --enable-decoder=LIBSPEEX_DECODER
129
130# ffmpeg ogg demuxer disabled for now (leaks memory, use mplayer's native ogg
131# support instead) --enable-demuxer=OGG_DEMUXER
132
133# ffmpeg vorbis is float-based and slow, using mplayer's internal tremor
134#instead --enable-decoder=VORBIS_DECODER
135
136ifdef CONFIG_BUILD_PATENTED
137CONFIGURE_ARGS+= --enable-mad \
138          --enable-mp3lib
139else
140CONFIGURE_ARGS+= --disable-mad \
141          --disable-mp3lib \
142        --disable-libmpeg2 \
143        --disable-libmpeg2-internal
144endif
91145
92146# mplayer makefile is soooo broken. have to specify libs by hand, if
93147# compileing with --enable-system-ffmpeg
...... 
116170endef
117171
118172$(eval $(call BuildPackage,MPlayer))
173
174
175# The following comments configure the Emacs editor. Just ignore them.
176# Local Variables:
177# compile-command: "make -C ~/h/src/qi/openwrt-xburst package/mplayer/compile -j4 V=99"
178# End:
mplayer/README
1this is outdated; mpeg1 support currently disabled (patents?).
2
3Use ffmpeg2theora or ffmpeg with vp8, vorbis, mkv
4
151. prepare your avi files for Ben:
26
37for i in $(echo "*.avi"); do /usr/bin/mencoder -o "$i.mpg" -vf scale=320:-2 -of mpeg -ovc lavc -lavcopts vcodec=mpeg1video:vpass=1:vbitrate=200 -ofps 24000/1001 -oac lavc -lavcopts acodec=mp2:abitrate=64 "$i" && /usr/bin/mencoder -o "$i.mpg" -vf scale=320:-2 -of mpeg -ovc lavc -lavcopts vcodec=mpeg1video:vpass=2:vbitrate=200 -ofps 24000/1001 -oac lavc -lavcopts acodec=mp2:abitrate=64 "$i"; done
mplayer/patches/015-patentparanoia.patch
1Index: MPlayer-r33304/configure
2===================================================================
3--- MPlayer-r33304.orig/configure 2011-04-24 12:39:13.000000000 +0200
4@@ -635,21 +635,28 @@
5 libopenjpeg=auto
6 libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
7 libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g')
8+libavdecoders=
9 libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
10 libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g')
11+libavencoders=
12 libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
13 libavparsers=$libavparsers_all
14+libavparsers=
15 libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
16 libavbsfs=$libavbsfs_all
17+libavbsfs=
18 libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
19 # Disable all hardware accelerators for now.
20 libavhwaccels=
21 libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
22 libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//)
23+libavdemuxers=
24 libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
25 libavmuxers=$(echo $libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// -e s/RTSP_MUXER//)
26+libavmuxers=
27 libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
28 libavprotocols=$libavprotocols_all
29+libavprotocols=
30 _mencoder=yes
31 _mplayer=yes
32 _x11=auto
33@@ -3366,7 +3373,8 @@
34 if test "$networking" = yes ; then
35   def_network='#define CONFIG_NETWORK 1'
36   def_networking='#define CONFIG_NETWORKING 1'
37- def_rtpdec='#define CONFIG_RTPDEC 1'
38+ # disabled, pulls in various patented crap (?)
39+# def_rtpdec='#define CONFIG_RTPDEC 1'
40   extra_ldflags="$extra_ldflags $_ld_sock"
41   inputmodules="networking $inputmodules"
42 else
43Index: MPlayer-r33304/Makefile
44===================================================================
45--- MPlayer-r33304.orig/Makefile 2011-04-24 19:15:52.000000000 +0200
46@@ -73,8 +73,9 @@
47                                         sub/av_sub.c \
48
49 # These filters use private headers and do not work with shared FFmpeg.
50-SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \
51- libmpcodecs/vf_fspp.c \
52+# removed: libaf/af_lavcac3enc.c (patents?)
53+
54+SRCS_COMMON-$(FFMPEG_A) += libmpcodecs/vf_fspp.c \
55                                         libmpcodecs/vf_mcdeint.c \
56                                         libmpcodecs/vf_qp.c \
57                                         libmpcodecs/vf_spp.c \
58Index: MPlayer-r33304/libaf/af.c
59===================================================================
60--- MPlayer-r33304.orig/libaf/af.c 2011-04-24 21:18:52.000000000 +0200
61@@ -71,9 +71,10 @@
62 #endif
63    &af_info_volnorm,
64    &af_info_extrastereo,
65-#ifdef CONFIG_FFMPEG_A
66- &af_info_lavcac3enc,
67-#endif
68+ /* AC3 disabled until patent status cleared */
69+/* #ifdef CONFIG_FFMPEG_A */
70+/* &af_info_lavcac3enc, */
71+/* #endif */
72 #ifdef CONFIG_FFMPEG
73    &af_info_lavcresample,
74 #endif

Archive Download the corresponding diff file



interactive