OpenWrt packages
Sign in or create your account | Project List | Help
OpenWrt packages Git Source Tree
Root/
| 1 | Index: MPlayer-r33304/configure |
| 2 | =================================================================== |
| 3 | --- MPlayer-r33304.orig/configure 2011-04-24 12:39:13.000000000 +0200 |
| 4 | +++ MPlayer-r33304/configure 2011-04-24 19:43:38.000000000 +0200 |
| 5 | @@ -635,21 +635,28 @@ |
| 6 | libopenjpeg=auto |
| 7 | libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') |
| 8 | libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g') |
| 9 | +libavdecoders= |
| 10 | libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') |
| 11 | libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g') |
| 12 | +libavencoders= |
| 13 | libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') |
| 14 | libavparsers=$libavparsers_all |
| 15 | +libavparsers= |
| 16 | libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') |
| 17 | libavbsfs=$libavbsfs_all |
| 18 | +libavbsfs= |
| 19 | libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') |
| 20 | # Disable all hardware accelerators for now. |
| 21 | libavhwaccels= |
| 22 | libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') |
| 23 | libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//) |
| 24 | +libavdemuxers= |
| 25 | libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') |
| 26 | libavmuxers=$(echo $libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// -e s/RTSP_MUXER//) |
| 27 | +libavmuxers= |
| 28 | libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') |
| 29 | libavprotocols=$libavprotocols_all |
| 30 | +libavprotocols= |
| 31 | _mencoder=yes |
| 32 | _mplayer=yes |
| 33 | _x11=auto |
| 34 | @@ -3366,7 +3373,8 @@ |
| 35 | if test "$networking" = yes ; then |
| 36 | def_network='#define CONFIG_NETWORK 1' |
| 37 | def_networking='#define CONFIG_NETWORKING 1' |
| 38 | - def_rtpdec='#define CONFIG_RTPDEC 1' |
| 39 | + # disabled, pulls in various patented crap (?) |
| 40 | +# def_rtpdec='#define CONFIG_RTPDEC 1' |
| 41 | extra_ldflags="$extra_ldflags $_ld_sock" |
| 42 | inputmodules="networking $inputmodules" |
| 43 | else |
| 44 | Index: MPlayer-r33304/Makefile |
| 45 | =================================================================== |
| 46 | --- MPlayer-r33304.orig/Makefile 2011-04-24 19:15:52.000000000 +0200 |
| 47 | +++ MPlayer-r33304/Makefile 2011-04-24 19:16:08.000000000 +0200 |
| 48 | @@ -73,8 +73,9 @@ |
| 49 | sub/av_sub.c \ |
| 50 | |
| 51 | # These filters use private headers and do not work with shared FFmpeg. |
| 52 | -SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \ |
| 53 | - libmpcodecs/vf_fspp.c \ |
| 54 | +# removed: libaf/af_lavcac3enc.c (patents?) |
| 55 | + |
| 56 | +SRCS_COMMON-$(FFMPEG_A) += libmpcodecs/vf_fspp.c \ |
| 57 | libmpcodecs/vf_mcdeint.c \ |
| 58 | libmpcodecs/vf_qp.c \ |
| 59 | libmpcodecs/vf_spp.c \ |
| 60 | Index: MPlayer-r33304/libaf/af.c |
| 61 | =================================================================== |
| 62 | --- MPlayer-r33304.orig/libaf/af.c 2011-04-24 21:18:52.000000000 +0200 |
| 63 | +++ MPlayer-r33304/libaf/af.c 2011-04-24 21:19:08.000000000 +0200 |
| 64 | @@ -71,9 +71,10 @@ |
| 65 | #endif |
| 66 | &af_info_volnorm, |
| 67 | &af_info_extrastereo, |
| 68 | -#ifdef CONFIG_FFMPEG_A |
| 69 | - &af_info_lavcac3enc, |
| 70 | -#endif |
| 71 | + /* AC3 disabled until patent status cleared */ |
| 72 | +/* #ifdef CONFIG_FFMPEG_A */ |
| 73 | +/* &af_info_lavcac3enc, */ |
| 74 | +/* #endif */ |
| 75 | #ifdef CONFIG_FFMPEG |
| 76 | &af_info_lavcresample, |
| 77 | #endif |
| 78 |
