Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 403 → Rev 402

/video-contact-sheet/branches/1.11.2/pkg/vcs
40,7 → 40,6
# - Remove extra, empty, temporary dir
# - Use standard awk syntax for exponentiation (pyth_th)
# - Workaround for systems that don't register fonts with ImageMagick
# * DEBUG: Print to stderr when probbing with mplayer too
# 1.11.1:
# * Added FLV1 codec
# * BUGFIXES:
2165,11 → 2164,11
# Note to self: Don't change the -vc as it would affect $vdec
if [ $DVD_MODE -eq 0 ]; then
MPLAYER_CACHE=$("$MPLAYER" -benchmark -ao null -vo null -identify -frames 0 \
-quiet "$f" 2>"$stderr" | grep ^ID)
-quiet "$f" 2>/dev/null | grep ^ID)
else
MPLAYER_CACHE=$("$MPLAYER" -benchmark -ao null -vo null -identify -frames 0 \
-quiet -dvd-device $DVD_FILE dvd://$DVD_TITLE \
2>"$stderr" | grep ^ID)
2>/dev/null | grep ^ID)
fi
# Note the head -1!
mi[$VCODEC]=$(grep ID_VIDEO_FORMAT <<<"$MPLAYER_CACHE" | head -1 | cut -d'=' -f2) # FourCC