Merge branch 'master' into rtd1296-ds6.2.4

This commit is contained in:
nap.liu 2022-12-19 14:39:11 +08:00
commit e4cf0c4b89
2 changed files with 7 additions and 7 deletions

View File

@ -30,7 +30,7 @@ function handle_error() {
function endprocess() {
info "========================================[end ffmpeg $pid]"
newline
kill -TERM "$child" 2>/dev/null
kill -TERM $child 2>/dev/null
# rm -f "$stderrfile"
exit 1
}
@ -46,7 +46,7 @@ newline
info "========================================[start ffmpeg $pid]"
info "DEFAULT_ARGS: $*"
/var/packages/ffmpeg/target/bin/ffmpeg "$@" 2> $stderrfile &
/var/packages/ffmpeg/target/bin/ffmpeg "$@" <&0 2> $stderrfile &
child=$!
wait "$child"
info "ffmpeg pid: $child"
wait $child

View File

@ -30,7 +30,7 @@ function handle_error() {
function endprocess() {
info "========================================[end gst-launch $pid]"
newline
kill -TERM "$child" 2>/dev/null
kill -TERM $child 2>/dev/null
# rm -f "$stderrfile"
exit 1
}
@ -50,6 +50,6 @@ export LD_LIBRARY_PATH=/var/packages/VideoStation/target/lib/patch/lib/
export GST_PLUGIN_PATH=/var/packages/VideoStation/target/lib/patch/plugins/
/var/packages/VideoStation/target/bin/gst-launch-1.0.orig "$@" 2> $stderrfile &
child=$!
wait "$child"
info "gst-launch pid: $child"
wait $child