projects / packages / mplayer.git / blame
| Commit | Line | Data |
|---|---|---|
| bc84bb25 KK |
1 | --- mplayer-r29930/configure.orig 2010-01-12 22:58:31.541952835 +0100 |
| 2 | +++ mplayer-r29930/configure 2010-01-12 23:50:32.521942542 +0100 | |
| 3 | @@ -544,19 +544,19 @@ | |
| 53082239 | 4 | _libavcodec_a=auto |
| bc84bb25 KK |
5 | _libopencore_amrnb=auto |
| 6 | _libopencore_amrwb=auto | |
| 7 | -_libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 8 | +_libavdecoders_all=$(s$ffmpeg_config --decoders || sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 9 | _libavdecoders=$(echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//) | |
| 10 | -_libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 11 | +_libavencoders_all=$(s$ffmpeg_config --encoders || sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 12 | _libavencoders=$(echo $_libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g' -e s/AAC_ENCODER//) | |
| 13 | -_libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 14 | +_libavparsers_all=$($ffmpeg_config --parsers || sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 53082239 | 15 | _libavparsers=$_libavparsers_all |
| bc84bb25 KK |
16 | -_libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') |
| 17 | +_libavbsfs_all=$($ffmpeg_config --bsfs || sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 53082239 | 18 | _libavbsfs=$_libavbsfs_all |
| bc84bb25 KK |
19 | -_libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') |
| 20 | +_libavdemuxers_all=$($ffmpeg_config --demuxers || sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 21 | _libavdemuxers=$(echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER//) | |
| 22 | -_libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 23 | +_libavmuxers_all=$($ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 24 | _libavmuxers=$(echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER//) | |
| 25 | -_libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 26 | +_libavprotocols_all=$($ffmpeg_config --protocols || sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 27 | _libavprotocols="" | |
| 53082239 ER |
28 | _libavcodec_so=auto |
| 29 | _libavformat_a=auto | |
| bc84bb25 KK |
30 | --- mplayer-r29930/Makefile.orig 2010-01-12 22:58:23.544432761 +0100 |
| 31 | +++ mplayer-r29930/Makefile 2010-01-12 23:10:19.701953264 +0100 | |
| 32 | @@ -792,10 +792,6 @@ | |
| 33 | ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1)) | |
| 34 | ||
| 35 | FFMPEGPARTS = libavcodec \ | |
| 36 | - libavformat \ | |
| 37 | - libavutil \ | |
| 38 | - libpostproc \ | |
| 39 | - libswscale \ | |
| 40 | ||
| 41 | FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) | |
| 42 | FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS])) |