We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 60
ffxvid.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Fri Oct 18 04:56:00 UTC 2019 - neutrino8@opensuse.org4
+5
+- Update to version 1.4.76
+ * Bugfix: use correct video track for crop preview with MPlayer7
+ * Bugfix: missing ;; in the additional container formats code8
+ * Renamed variable SCAN_MULTIPLE_VID_TRACKS to SCAN_MULTI_VID_TRACKS9
+ * Some reordering in the config file10
+ * Set Catmull-Rom as default Bicubic/Spline tuning11
+ * Add LPCM detection for audio copy12
+ * Support the mp4/m4v containers13
+ * Add support for cover art for the mp4/m4v/mov containers. 14
+ Requires MP4Box from GPAC15
+ * Some code optimization16
+17
+-------------------------------------------------------------------18
Thu Oct 17 05:40:00 UTC 2019 - neutrino8@opensuse.org19
20
- Update to version 1.4.621
ffxvid.spec
Changed
18
1
2
3
4
Name: ffxvid5
-Version: 1.4.66
+Version: 1.4.77
Release: 08
Summary: A small shell script for encoding to H.264 with ffmpeg9
License: GPL-2.0+10
11
Requires: ffmpeg12
Requires: bc13
Requires: MPlayer14
+Requires: gpac15
BuildRoot: %{_tmppath}/%{name}-%{version}-build16
BuildArch: noarch17
18
ffxvid-1.4.6.tar.gz/ChangeLog -> ffxvid-1.4.7.tar.gz/ChangeLog
Changed
20
1
2
+2019-10-18 - ffxvid 1.4.73
+ * Bugfix: use correct video track for crop4
+ preview with MPlayer5
+ * Bugfix: missing ;; in the additional container6
+ formats code7
+ * Renamed variable SCAN_MULTIPLE_VID_TRACKS to8
+ SCAN_MULTI_VID_TRACKS9
+ * Some reordering in the config file10
+ * Set Catmull-Rom as default Bicubic/Spline tuning11
+ * Add LPCM detection for audio copy12
+ * Support the mp4/m4v containers13
+ * Add support for cover art for the mp4/m4v/mov14
+ containers. Requires MP4Box from GPAC15
+ * Some code optimization16
+17
2019-10-17 - ffxvid 1.4.618
* Support the WMV container format19
20
ffxvid-1.4.6.tar.gz/ffxvid -> ffxvid-1.4.7.tar.gz/ffxvid
Changed
201
1
2
#3
# Small script to encode to Xvid video using FFmpeg.4
# Author: Grozdan "microchip" Nikolov <neutrino8@opensuse.org>5
-# Version: 1.4.66
-# Date: 2019-10-177
+# Version: 1.4.78
+# Date: 2019-10-189
#10
# ffx264 is free software ; you can redistribute it and/or modify11
# it under the terms of the GNU General Public License as published by12
13
brown() { echo -e "\e[0;33m$1\e[0;39;49m"; }14
error() { echo -e "\e[1;31m$1\e[0;39;49m"; }15
16
-version="1.4.6"17
+version="1.4.7"18
19
CFG="$HOME/.ffxvid"20
-cfgversion="10"21
+cfgversion="11"22
23
genconfig_func() {24
cat<<EOF>>"$CFG"25
26
27
# Container format extension28
# Leave empty to ask each time29
+# Supported are:30
+# avi/mkv/mp4/m4v/mov/wmv31
CONFMT=""32
33
# Scan for multiple video tracks?34
-SCAN_MULTIPLE_VID_TRACKS="y"35
+SCAN_MULTI_VID_TRACKS="y"36
37
# Nice value (0-19)38
NICE="19"39
40
#41
SCALER=""42
43
-# Support FPS conversion?44
-VID_FPS_CONVERT="y"45
-46
# Video filters47
VID_DENOISE="y"48
VID_DEBLOCK="y"49
50
VID_HDR_TO_SDR="y"51
VID_PIXEL_FORMAT="y"52
VID_COLORSPACE="y"53
+VID_FPS_CONVERT="y"54
55
# Audio filters56
AUD_NORMALIZE="y"57
58
FFMPEG=""59
FFPROBE=""60
MPLAYER=""61
+MP4BOX=""62
63
# Add a custom comment to your encodes64
# Leave empty to disable/ask each time65
66
fi67
fi68
69
+if [ ! -z "$MP4BOX" ]; then70
+ if [ ! -x "$MP4BOX" ]; then71
+ error "-> MP4Box is missing from your system!"72
+ error "-> Check the config in '$CFG'"73
+ echo74
+ exit 175
+ fi76
+else77
+ MP4BOX="$(which MP4Box 2>/dev/null)"78
+ if [ ! -x "$MP4BOX" ]; then79
+ error "-> MP4Box is missing from your system!"80
+ echo81
+ exit 182
+ fi83
+fi84
+85
BC="$(which bc 2>/dev/null)"86
if [ ! -x "$BC" ]; then87
error "-> Utility 'bc' is missing from your system!"88
89
CONFMT="$(echo "$CONFMT" | tr '[:upper:]' '[:lower:]')"90
if [ ! -z "$CONFMT" ]; then91
case "$CONFMT" in92
- mov) movflags="-movflags +faststart" ;;93
+ mp4|m4v|mov) movflags="-movflags +faststart" ;;94
avi|mkv|wmv) true ;;95
*)96
error "-> Xvid video not supported by the chosen container!"97
98
input="$(readlink -e "$input")"99
fi100
101
-if [ "$SCAN_MULTIPLE_VID_TRACKS" = "y" ]; then102
+if [ "$SCAN_MULTI_VID_TRACKS" = "y" ]; then103
printf "Scan for Multiple Video Tracks? [y/N]: "104
read mvt105
if [ "$mvt" = "y" -o "$mvt" = "Y" ]; then106
107
fi108
109
if [ -z "$CONFMT" ]; then110
- printf "Which Container Format to use? [avi/mkv/mov/wmv - default is avi]: "111
+ printf "Which Container Format to Use? [avi/mkv/mp4/m4v/mov/wmv - default is avi]: "112
read confmt113
test -z "$confmt" && CONFMT="avi" || CONFMT="$confmt"114
fi115
116
if [ ! -z "$remuxcon" ]; then117
container_func() {118
case "$1" in119
- avi|mov|wmv)120
+ avi|mp4|m4v|mov|wmv)121
green "-> Note: additional container $i supports the following audio codecs:"122
;;123
esac124
case "$1" in125
+ mp4) green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|flac|copy" ;;126
+ m4v) green "-> ac3|aac|fdk-aac|alac|copy" ;;127
mov) green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|alac|copy" ;;128
avi) green "-> ac3|dts|aac|fdk-aac|mp3|vorbis|wmav1|wmav2|pcm|flac|copy" ;;129
- wmv) green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|wmav1|wmav2|flac|copy"130
+ wmv) green "-> ac3|eac3|dts|aac|fdk-aac|mp3|vorbis|wmav1|wmav2|flac|copy" ;;131
other)132
error "-> Xvid video not supported by the $i container!"133
- error "-> Supported containers are: avi, mov, mkv, wmv"134
+ error "-> Supported containers are: avi, mp4, m4v, mov, mkv, wmv"135
echo136
exit 1137
;;138
139
mkv)140
green "-> Note: additional container $i supports all the audio codecs"141
;;142
+ mp4) container_func mp4 ;;143
+ m4v) container_func m4v ;;144
mov) container_func mov ;;145
avi) container_func avi ;;146
wmv) container_func wmv ;;147
148
test ! -z "$comment" && COMMENT="$comment"149
fi150
151
-if [ "$CONFMT" = "mkv" ]; then152
+case "$CONFMT" in153
+ mkv|mp4|m4v|mov)154
printf "Specify a Cover Image in JPG/PNG format [press 'Enter' to skip]: "155
read -e cover156
if [ ! -z "$cover" ]; then157
158
exit 1159
;;160
esac161
- METACOVER="-attach \"$(readlink -e "$cover")\" -metadata:s:t mimetype=\"image/$img\""162
+ case "$CONFMT" in163
+ mkv) METACOVER="-attach \"$(readlink -e "$cover")\" -metadata:s:t mimetype=\"image/$img\"" ;;164
+ *) MP4COVER="-itags cover=\"$(readlink -e "$cover")\"" ;;165
+ esac166
+ if [ ! -z "$remuxcon" ]; then167
+ for i in $remuxcon; do168
+ case "$i" in169
+ mp4|m4v|mov) MP4COVER2="-itags cover=\"$(readlink -e "$cover")\"" ;;170
+ esac171
+ done172
+ fi173
fi174
fi175
-fi176
+ ;;177
+esac178
179
case "$encmode" in180
[1-2]p)181
182
read vbtr183
test -z "$vbtr" && vbitrate="8000k" || vbitrate="${vbtr}k"184
;;185
- *|"")186
+ ""|cq)187
if [ -z "$CQ" ]; then188
printf "Specify a CQ Value for the Encoding [0-31 - default is 2]: "189
read cq190
191
else192
startpos="$timepos"193
fi194
- $MPLAYER "$input" -vf rectangle=$crop_preview -noconfig all -nocache -ao null -ss $startpos -endpos 10 >/dev/null 2>&1195
+ $MPLAYER "$input" -vid $vidtrack -vf rectangle=$crop_preview -noconfig all -nocache -ao null -ss $startpos -endpos 10 >/dev/null 2>&1196
fi197
fi198
printf "Are you Satisfied with the Crop Area? [y/N]: "199
200
echo " 3 -> Cubic B-Spline (1.00, 0.00)"201
ffxvid-1.4.6.tar.gz/preset.txt -> ffxvid-1.4.7.tar.gz/preset.txt
Changed
7
1
2
# Constant quantizer3
CQ="2"4
5
-XVIDPARAMS="-flags +mv4+aic+cgop -bf 2 -mbd 2 -mpeg_quant 1 -variance_aq 1 -trellis 1"6
+XVIDPARAMS="-flags +mv4+aic+cgop -me_quality 6 -bf 2 -mbd 2 -mpeg_quant 1 -variance_aq 1 -trellis 1"7