Subversion Repositories pub

Compare Revisions

No changes between revisions

Ignore whitespace Rev 582 → Rev 583

/video-contact-sheet/trunk/dist/debian/changelog
1,3 → 1,9
vcs (1.13.2-pon.1) experimental; urgency=medium
 
* New version
 
-- Toni Corvera <outlyer@gmail.com> Fri, 18 May 2014 17:41:44 +0200
 
vcs (1.13.1-pon.1) experimental; urgency=low
 
* New version
/video-contact-sheet/trunk/dist/CHANGELOG
1,3 → 1,10
1.13.2 (2014-05-18):
* BUGFIX: Fixed number of captures exceeded by one with mplayer [#225]
Reported by Miya
* OTHER: (BUGFIX in prereleases)
Fixed error when processing files with quotes in the file name
[#226]
 
1.13.1 (2014-02-26):
* BUGFIX: Fixed uncommon bug with unwrapped grep string [#217]
Submitted by Eris Belew
/video-contact-sheet/trunk/dist/vcs
29,9 → 29,9
# The full changelog can be found at <http://p.outlyer.net/vcs/files/CHANGELOG>
 
 
declare -r VERSION="1.13.1"
declare -r VERSION="1.13.2"
declare -r RELEASE=1
declare -ri PRERELEASE=1
declare -ri PRERELEASE=3
[ "$RELEASE" -eq 1 ] || declare -r SUBVERSION="-pre.${PRERELEASE}"
 
set -e
1507,7 → 1507,7
 
(( n++ ));
done
assert "[[ -n '$to' ]]"
assert "[[ -n '${to//\'/\'\\\'\'}' ]]" # [[ -n '$to' ]] + escape single quotes
 
mvq "$from" "$to"
echo "$to"
1913,7 → 1913,7
# the actual values. See identify_video()
# mplayer_identify($1 = file)
mplayer_identify() {
trace $FUNCNAME $@
trace $@
assert '[[ $MPLAYER_BIN ]]'
local f="$1"
local mi=( )
2006,7 → 2006,7
# Capture a frame with mplayer
# mplayer_dvd_capture($1 = inputfile, $2 = timestamp, $3 = output)
mplayer_dvd_capture() {
trace $FUNCNAME $@
trace $@
# Note mplayer CAN'T set the output filename, newer mplayer can set output
#+dir though.
local f="$1"
2063,7 → 2063,7
# the actual values. See identify_video()
# mplayer_identify($1 = file)
ffmpeg_identify() {
trace $FUNCNAME $@
trace $@
assert '[[ $FFMPEG_BIN ]]'
local f="$1"
# DVD Devices *MUST* be mounted for the identifying process to even start
2434,6 → 2434,12
local bound=$(awkexf "$end - $eo")
local last=
while fptest $stamp -le "$bound"; do
# Due to rounding (i.e. with mplayer), the loop might need an extra run
# to reach the end of the video.
# Ensure it doesn't if the user requested a specific number of captures
if [[ ( $tcfrom -eq $TC_NUMCAPS ) && ( ${#LTC[@]} -gt $tcnumcaps ) ]]; then
break
fi
assert fptest $stamp -ge 0
LTC=( "${LTC[@]}" "$stamp" )
last=$stamp
3265,7 → 3271,7
# 4: Failed to detect width or height
# classic_identify($1 = file)
classic_identify() {
trace $FUNCNAME $@
trace $@
local RET_NOLEN=3 RET_NODIM=4
 
assert '[[ $MPLAYER_BIN && $FFMPEG_BIN ]]'
/video-contact-sheet/trunk/Makefile
96,7 → 96,8
uploadclean:
$(RM) -ri vcs Makefile *.changes dist
 
deb:
deb: vcs-$(VER).tar.gz
ln -sf vcs-$(VER).tar.gz vcs_$(VER).orig.tar.gz
cd dist && debuild -k0x5812006E -us -uc && debclean
#$(RM) vcs_*.changes vcs_*.build
 
/video-contact-sheet/trunk/.
Property changes:
Modified: svn:mergeinfo
Merged /video-contact-sheet/branches/1.13.2:r576-582