Projects
Multimedia
h264enc
Sign Up
Log In
Username
Password
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
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 388
View file
h264enc.spec
Changed
@@ -1,7 +1,7 @@ # norootforbuild Name: h264enc -Version: 10.4.2 +Version: 10.4.3 Release: 1 License: GPL-2.0+ @@ -58,6 +58,11 @@ %changelog +* Tue Sep 08 2015 Grozdan Nikolov <neutrino8@gmail.com> 10.4.3 + * Removed the $ from the index of array variables + * Be more portable and use eval instead of seq in loops as seq is + too Linux-specific + * Sun Sep 06 2015 Grozdan Nikolov <neutrino8@gmail.com> 10.4.2 * Increased the default audio bitrate/quality value for Vorbis audio * Added mov file extention to the supported formats for chapter dumps
View file
h264enc-10.4.2.tar.gz/doc/ChangeLog -> h264enc-10.4.3.tar.gz/doc/ChangeLog
Changed
@@ -1,3 +1,8 @@ +2015-09-08 - h264enc 10.4.3 + * Removed the $ from the index of array variables + * Be more portable and use eval instead of seq in loops as seq is + too Linux-specific + 2015-09-06 - h264enc 10.4.2 * Increased the default audio bitrate/quality value for Vorbis audio * Added mov file extention to the supported formats for chapter dumps
View file
h264enc-10.4.2.tar.gz/h264enc -> h264enc-10.4.3.tar.gz/h264enc
Changed
@@ -1,5 +1,5 @@ #!/usr/bin/env bash -# $Id: h264enc, v 10.4.2, 2015/09/06, gn Exp $ +# $Id: h264enc, v 10.4.3, 2015/09/08, gn Exp $ # # Encode BDs/DVDs/VCDs/video files to the H.264/AVC/MPEG-4 Part 10 # video format using MEncoder from MPlayer @@ -23,7 +23,7 @@ shopt -u expand_aliases export PATH=$PATH:/usr/local/bin -version=10.4.2 +version=10.4.3 configversion=35 green() { echo -e "\e[1;32m$1\e[0;39;49m"; } @@ -176,11 +176,11 @@ # Amount of audio tracks to support # Any non-zero value will do -MAX_AMOUNT_AUD_TRACKS="3" +MAX_AMOUNT_AUD_TRACKS="2" # Amount of subtitles to support # Any non-zero value will do -MAX_AMOUNT_SUBS="3" +MAX_AMOUNT_SUBS="2" # Containers ALLOW_MKV_MUXING="y" @@ -2827,11 +2827,11 @@ video_subtitles_language_func() { printf "Provide the 2 or 3 letter Language code (sub $i) [press 'Enter' to skip]: " - read sublang[$i] - if [ ! -z "${sublang[$i]}" ]; then - SUBLANG[$i]="${sublang[$i]}" + read sublang[i] + if [ ! -z "${sublang[i]}" ]; then + SUBLANG[i]="${sublang[i]}" else - SUBLANG[$i]=und + SUBLANG[i]=und fi } @@ -2868,18 +2868,18 @@ fi ;; import-external) - for i in $(seq 1 $MAX_AMOUNT_SUBS); do + for i in $(eval echo "{1..$MAX_AMOUNT_SUBS}"); do printf "Provide the Subtitle file (Sub $i) [press 'Enter' to skip]: " - read -e subfile[$i] - if [ ! -z "${subfile[$i]}" ]; then - if [ ! -f "${subfile[$i]}" ]; then + read -e subfile[i] + if [ ! -z "${subfile[i]}" ]; then + if [ ! -f "${subfile[i]}" ]; then echo - error "-> No such file: '${subfile[$i]}'" + error "-> No such file: '${subfile[i]}'" error "-> Skipping subtitle $i" echo else video_subtitles_language_func - EXTSUB[$i]="${subfile[$i]}" + EXTSUB[i]="${subfile[i]}" fi fi done @@ -2978,20 +2978,20 @@ # encoding time, second/third/... one after # encoding has finished get_subtitles_func $source - for i in $(seq 1 $MAX_AMOUNT_SUBS); do + for i in $(eval echo "{1..$MAX_AMOUNT_SUBS}"); do printf "Specify the Subtitle ID number (sub $i) [press 'Enter' to skip]: " - read subid[$i] - if [ ! -z "$(echo ${subid[$i]} | grep '[a-zA-Z]')" ]; then + read subid[i] + if [ ! -z "$(echo ${subid[i]} | grep '[a-zA-Z]')" ]; then echo error "-> You have to specify the Subtitle ID number, not the language code!" error "-> Skipping subtitle $i" echo else - if [ ! -z "${subid[$i]}" ]; then - subtitle[$i]="-sid ${subid[$i]}" - vobsubout[$i]="-vobsubout \"${OUTPUT%.*}_sub$i\" -vobsuboutindex $(($i-1))" - IDXFILE[$i]="${OUTPUT%.*}_sub$i.idx" - SUBFILE[$i]="${OUTPUT%.*}_sub$i.sub" + if [ ! -z "${subid[i]}" ]; then + subtitle[i]="-sid ${subid[i]}" + vobsubout[i]="-vobsubout \"${OUTPUT%.*}_sub$i\" -vobsuboutindex $(($i-1))" + IDXFILE[i]="${OUTPUT%.*}_sub$i.idx" + SUBFILE[i]="${OUTPUT%.*}_sub$i.sub" fi fi done @@ -3344,25 +3344,25 @@ ;; subs) if [ ! -z "${vobsubout[*]}" ]; then - for i in $(seq 1 $MAX_AMOUNT_SUBS); do - if [ -e "${IDXFILE[$i]}" -o -e "${SUBFILE[$i]}" ]; then + for i in $(eval echo "{1..$MAX_AMOUNT_SUBS}"); do + if [ -e "${IDXFILE[i]}" -o -e "${SUBFILE[i]}" ]; then echo break fi done fi counter=1 - for i in $(seq 1 $MAX_AMOUNT_SUBS); do - while [ -e "${IDXFILE[$i]}.$counter.old" -o -e "${SUBFILE[$i]}.$counter.old" ]; do + for i in $(eval echo "{1..$MAX_AMOUNT_SUBS}"); do + while [ -e "${IDXFILE[i]}.$counter.old" -o -e "${SUBFILE[i]}.$counter.old" ]; do counter=$(($counter+1)) done - if [ -e "${IDXFILE[$i]}" ]; then - green "-> Renaming existing file to '$(basename "${IDXFILE[$i]}.$counter.old")'" - mv -f "${IDXFILE[$i]}" "${IDXFILE[$i]}.$counter.old" - fi - if [ -e "${SUBFILE[$i]}" ]; then - green "-> Renaming existing file to '$(basename "${SUBFILE[$i]}.$counter.old")'" - mv -f "${SUBFILE[$i]}" "${SUBFILE[$i]}.$counter.old" + if [ -e "${IDXFILE[i]}" ]; then + green "-> Renaming existing file to '$(basename "${IDXFILE[i]}.$counter.old")'" + mv -f "${IDXFILE[i]}" "${IDXFILE[i]}.$counter.old" + fi + if [ -e "${SUBFILE[i]}" ]; then + green "-> Renaming existing file to '$(basename "${SUBFILE[i]}.$counter.old")'" + mv -f "${SUBFILE[i]}" "${SUBFILE[i]}.$counter.old" fi done ;; @@ -3705,7 +3705,7 @@ if [ ! -z "$BDTITLES" ]; then green "-> Found $BDTITLES titles" echo - for t in $(seq 1 $BDTITLES); do + for t in $(eval echo "{1..$BDTITLES}"); do TITLELENGTH="$($MPLAYER br:// $MPLAYEROPTS $device $MPOPTS 2>/dev/null | grep "^ID_BLURAY_TITLE_${t}_LENGTH" | awk -F= '{print $2}')" if [ ! -z "$TITLELENGTH" -a "$TITLELENGTH" != "0.000" -a "$TITLELENGTH" != "0" ]; then green "-> Title $t: $(($(echo "$TITLELENGTH" | awk -F. '{print $1}')/60)) minutes or $TITLELENGTH seconds" @@ -5144,7 +5144,7 @@ error "-> Could not detect any audio tracks and info!" else TRKID="$(($TRKS-1))" - for i in $(seq 0 $TRKID); do + for i in $(eval echo "{0..$TRKID}"); do AUDINFO="$TEMPDIR/audinfo" $MPLAYER "$sourcetype" $MPLAYEROPTS $device $demuxer $cache -channels 8 -vo null -ao null -aid $i -identify -frames 1 2>/dev/null > "$AUDINFO" AUDCDC="$(grep '^ID_AUDIO_CODEC' "$AUDINFO" | tail -n 1 | awk -F= '{print $2}' | sed 's|ff||g')" @@ -5170,7 +5170,7 @@ AUDCH="?" fi if [ "$AUDCH" != "?" ]; then - MAXAUDCH[$i]="$AUDCH" + MAXAUDCH[i]="$AUDCH" fi if [ -z "$AUDRATE" ]; then AUDRATE="?" @@ -5183,8 +5183,8 @@ fi CDCNAME="$(echo "$AUDCDC" | tr '[:lower:]' '[:upper:]' | sed 's|DCA|DTS|; s|AC3|AC-3|; s|TRUEHD|Dolby TrueHD|; s|MP3FLOAT|MP3|; s|EAC3|E-AC-3|')" green "-> Track $(($i+1)): Audio ID: $i, Codec: $CDCNAME, Bitrate: $AUDBTR, Rate: $AUDRATE, Channels: $AUDCH, Language: $AUDLNG" - if [ ! -z "${MAXAUDCH[$i]}" ]; then - if [ ${MAXAUDCH[$i]} -gt 6 ]; then + if [ ! -z "${MAXAUDCH[i]}" ]; then + if [ ${MAXAUDCH[i]} -gt 6 ]; then error "-> Track $(($i+1)): Warning: track contains more than 6 channels. Max supported by h264enc is 6!" fi fi @@ -5194,7 +5194,7 @@ ;; esac echo - for i in $(seq 1 $MAX_AMOUNT_AUD_TRACKS); do + for i in $(eval echo "{1..$MAX_AMOUNT_AUD_TRACKS}"); do if [ "$i" = "1" ]; then case "$source" in file|bd) defdac="default is 0" ;; @@ -5204,8 +5204,8 @@ defdac="press 'Enter' to skip" fi printf "Track $i: Specify the Audio ID number [$defdac]: " - read dac[$i] - if [ ! -z "$(echo ${dac[$i]} | grep '[a-zA-Z]')" ]; then + read dac[i] + if [ ! -z "$(echo ${dac[i]} | grep '[a-zA-Z]')" ]; then error "-> You have to specify the 'Audio ID' number, not the language code!" exit_func 1 fi @@ -5216,32 +5216,32 @@ TRACKID[1]=yes aid[1]="-aid ${dac[1]}" else - if [ ! -z "${dac[$i]}" ]; then
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.