Merge branch 'master' into rtd1296-ds6.2.4

This commit is contained in:
nap.liu 2022-12-19 13:31:23 +08:00
commit a5591c0aa4
2 changed files with 8 additions and 3 deletions

View File

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

View File

@ -30,6 +30,7 @@ function handle_error() {
function endprocess() {
info "========================================[end gst-launch $pid]"
newline
kill -TERM "$child" 2>/dev/null
# rm -f "$stderrfile"
exit 1
}
@ -48,5 +49,7 @@ info "DEFAULT_ARGS: $*"
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
/var/packages/VideoStation/target/bin/gst-launch-1.0.orig "$@" 2> $stderrfile &
child=$!
wait "$child"