Commit 444b2631 authored by diego's avatar diego

cosmetics: Consistently indent with 4 spaces, break some long lists into single

lines, align some columns.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11081 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cd83cc85
...@@ -924,8 +924,16 @@ OUTDEV_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/lib ...@@ -924,8 +924,16 @@ OUTDEV_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/lib
INDEV_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavdevice/alldevices.c"` INDEV_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavdevice/alldevices.c"`
PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"` PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"`
enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST $PROTOCOL_LIST $BSF_LIST $INDEV_LIST $OUTDEV_LIST enable $ARCH_EXT_LIST \
enable $ARCH_EXT_LIST $DECODER_LIST \
$ENCODER_LIST \
$PARSER_LIST \
$BSF_LIST \
$DEMUXER_LIST \
$MUXER_LIST \
$PROTOCOL_LIST \
$INDEV_LIST \
$OUTDEV_LIST \
die_unknown(){ die_unknown(){
echo "Unknown option \"$1\"." echo "Unknown option \"$1\"."
...@@ -1669,7 +1677,7 @@ check_header dev/ic/bt8xx.h ...@@ -1669,7 +1677,7 @@ check_header dev/ic/bt8xx.h
check_header sys/soundcard.h check_header sys/soundcard.h
check_header soundcard.h check_header soundcard.h
# Deal with the x11 frame grabber # deal with the X11 frame grabber
enabled x11grab && enabled x11grab &&
check_header X11/Xlib.h && check_header X11/Xlib.h &&
check_header X11/extensions/XShm.h && check_header X11/extensions/XShm.h &&
...@@ -1727,20 +1735,28 @@ if test $asmalign_pot = "unknown"; then ...@@ -1727,20 +1735,28 @@ if test $asmalign_pot = "unknown"; then
echo 'asm (".align 3");' | check_cc && enable asmalign_pot echo 'asm (".align 3");' | check_cc && enable asmalign_pot
fi fi
enabled_any $ENCODER_LIST && enable encoders
enabled_any $DECODER_LIST && enable decoders enabled_any $DECODER_LIST && enable decoders
enabled_any $MUXER_LIST && enable muxers enabled_any $ENCODER_LIST && enable encoders
enabled_any $BSF_LIST && enable bsfs
enabled_any $DEMUXER_LIST && enable demuxers enabled_any $DEMUXER_LIST && enable demuxers
enabled_any $OUTDEV_LIST && enable muxers enabled_any $MUXER_LIST && enable muxers
enabled_any $INDEV_LIST && enable demuxers enabled_any $INDEV_LIST && enable demuxers
enabled_any $OUTDEV_LIST && enable muxers
enabled_any $PROTOCOL_LIST && enable protocols enabled_any $PROTOCOL_LIST && enable protocols
enabled_any $BSF_LIST && enable bsfs
enabled_any $THREADS_LIST && enable threads enabled_any $THREADS_LIST && enable threads
check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \ check_deps $CONFIG_LIST \
$BSF_LIST $DEMUXER_LIST $MUXER_LIST $PROTOCOL_LIST \ $HAVE_LIST \
$INDEV_LIST $OUTDEV_LIST $DECODER_LIST \
$ENCODER_LIST \
$PARSER_LIST \
$BSF_LIST \
$DEMUXER_LIST \
$MUXER_LIST \
$INDEV_LIST \
$OUTDEV_LIST \
$PROTOCOL_LIST \
enabled libdc1394 && append pkg_requires "libraw1394" enabled libdc1394 && append pkg_requires "libraw1394"
enabled libtheora && append pkg_requires "theora" enabled libtheora && append pkg_requires "theora"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment