Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 630 → Rev 631

/video-contact-sheet/trunk/dist/CHANGELOG
1,10 → 1,12
1.13.3 (?):
* Added codec ID for h.265
* Added codec IDs for h.265 and VP9
* BUGFIX: Fix handling of failed captures
* BUGFIX: Fix handling of failed identification
* BUGFIX: Cleaned output for identification of unsupported file types
* OTHER: Print warning about possible lack of support if no frame could be
captured
* OTHER: Don't trust MPlayer's detection of raw video, use FFmpeg's
detection in such case
 
1.13.2 (2014-05-18):
* BUGFIX: Fixed number of captures exceeded by one with mplayer [#225]
/video-contact-sheet/trunk/dist/vcs
3065,6 → 3065,7
# Synthetic, used for ffmpeg translations
vcs_divx) vcodec="DivX ;-)" ;;
vcs_hevc) vcodec="HEVC" ;; # Not yet supported by MPlayer
vcs_vp9) vcodec="VP9" ;; # Detected as rawyuy2 by MPlayer
*) # If not recognized fall back to FourCC
vcodec="$vcid"
;;
3096,6 → 3097,7
camtasia) mpid="tscc" ;;
vp6|vp6a|vp6f) mpid="VP60" ;;
vp8) mpid="VP80" ;;
vp9) mpid="vcs_vp9" ;; # Not supported by MPlayer?
# TODO List of codec id's I translate but haven't tested:
#+ svq3, rv40, theora, camtasia, vp6*
# MPlayer uses uppercase whereas FFmpeg uses lowercase
3374,6 → 3376,12
if [[ $(awkex "int(${VID[$FPS]})") == "${VID[$FPS]}" ]]; then
VID[$FPS]="${VID[$FPS]}.00"
fi
# MPlayer tends to identify as raw video if it doesn't support the codec
# fall back to FFmpeg in such case
if [[ ${MPLAYER_ID[$VCODEC]} = "0x00000000" ]]; then
VID[$VCODEC]=${FFMPEG_ID[$VCODEC]}
VID[$VCNAME]=${FFMPEG_ID[$VCNAME]}
fi
 
local mfps="${MPLAYER_ID[$FPS]}"
if [[ ( $QUIRKS -eq 0 ) && ( -n $MPLAYER_BIN ) ]] && fptest "$mfps" -eq 1000 ; then