mirror of
https://github.com/mpv-player/mpv
synced 2025-02-21 23:36:58 +00:00
Fix compilation after FFmpeg AUDIO_(DE)MUXER split
The FFmpeg build system split AUDIO_(DE)MUXER into two parts: AUDIO_BEOS_(DE)MUXER and OSS_(DE)MUXER. cehoyos's earlier fix only changed the code from AUDIO_(DE)MUXER to AUDIO_BEOS_(DE)MUXER ignoring the other half of the split. Fix it to also disable OSS_(DE)MUXER. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24360 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5adf40cf5d
commit
cc9a2372cd
4
configure
vendored
4
configure
vendored
@ -508,9 +508,9 @@ _libavparsers=$_libavparsers_all
|
||||
_libavbsfs_all=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
|
||||
_libavbsfs=$_libavbsfs_all
|
||||
_libavdemuxers_all=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
|
||||
_libavdemuxers=`echo $_libavdemuxers_all | sed -e s/AUDIO_BEOS_DEMUXER// -e s/DC1394_DEMUXER// -e s/DV1394_DEMUXER// -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/V4L_DEMUXER// -e s/BKTR_DEMUXER// -e s/X11_GRAB_DEVICE_DEMUXER// -e s/V4L2_DEMUXER// -e s/LIBNUT_DEMUXER// `
|
||||
_libavdemuxers=`echo $_libavdemuxers_all | sed -e s/AUDIO_BEOS_DEMUXER// -e/OSS_DEMUXER// -e s/DC1394_DEMUXER// -e s/DV1394_DEMUXER// -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/V4L_DEMUXER// -e s/BKTR_DEMUXER// -e s/X11_GRAB_DEVICE_DEMUXER// -e s/V4L2_DEMUXER// -e s/LIBNUT_DEMUXER// `
|
||||
_libavmuxers_all=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
|
||||
_libavmuxers=`echo $_libavmuxers_all | sed -e s/AUDIO_BEOS_MUXER// -e s/RTP_MUXER// `
|
||||
_libavmuxers=`echo $_libavmuxers_all | sed -e s/AUDIO_BEOS_MUXER// -e s/OSS_MUXER// -e s/RTP_MUXER// `
|
||||
_libavprotocols_all=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
|
||||
_libavcodec_so=auto
|
||||
_libavformat_a=auto
|
||||
|
Loading…
Reference in New Issue
Block a user