Commit f0d2616a authored by Booloki's avatar Booloki

Default use of ffmpeg instead of avconv

parent 0839427a
......@@ -54,9 +54,9 @@ WAZZUF_SEPARATOR_FOOT=" *************************************\n"
## CONV PROJECT
# Choice between avconv (Debian/Ubuntu) and ffmpeg (others)
CONV_PROJECT="avconv"
#CONV_PROJECT="ffmpeg"
# Choice between ffmpeg and avconv (ffmpeg fork - previously in Debian and Debian-based distributions)
CONV_PROJECT="ffmpeg"
#CONV_PROJECT="avconv"
## DISCS CAPACITY
......
......@@ -61,20 +61,6 @@ touch "${CONF_FILE_TMP}"
} > "${CONF_FILE_TMP}"
# CONV_PROJECT detection
# Better set in wazzuf-ripper-global.conf file - but need rights
if [[ "${CONV_PROJECT}" == "avconv" ]] && [ ! -x /usr/bin/avconv ] && [ -x /usr/bin/ffmpeg ]; then
# Linux distribution seems not to be Debian-based
{ echo ""
echo "# Dirty ffmpeg/libav hack"
echo "# You should manually set CONV_PROJECT=\"ffmpeg\" in ${GLOBAL_CONF_FILE} !"
echo "CONV_PROJECT=\"ffmpeg\""
} >> "${CONF_FILE_TMP}"
# apply parameter
CONV_PROJECT="ffmpeg"
fi
## MEDIA INFORMATIONS
{ echo ""
echo ""
......
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