nativeaudio

commit 2e9921f9bc54ac2034521aa2758555dfd621c6c7
parent 5a620efc525d83480f48978f91da004c633f5d7d
Author: Jack Mordaunt <jackmordaunt.dev@gmail.com>
Date:   Mon, 23 Oct 2023 08:43:18 +0800

ffmpeg: combine stdout and stderr

Stderr doesn't contain useful information, but stdout does.

Signed-off-by: Jack Mordaunt <jackmordaunt.dev@gmail.com>

Diffstat:
M
audio_ffmpeg.go
 | 
10
+++-------

1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/audio_ffmpeg.go b/audio_ffmpeg.go
@@ -109,12 +109,8 @@ func FFmpegDecode(by []byte) ([]byte, Format, error) {
 // ffprobe results.
 //
 //	ffprobe -i <path> -v quiet -print_format json -show_format -show_streams
-//
 func probe(path string) (Format, error) {
-	var (
-		stderr = bytes.NewBuffer(nil)
-		stdout = bytes.NewBuffer(nil)
-	)
+	stdout := bytes.NewBuffer(nil)
 	cmd := exec.Command(
 		"ffprobe",
 		"-i", path,
@@ -124,9 +120,9 @@ func probe(path string) (Format, error) {
 		"-show_streams",
 	)
 	cmd.Stdout = stdout
-	cmd.Stderr = stderr
+	cmd.Stderr = stdout
 	if err := cmd.Run(); err != nil {
-		return Format{}, fmt.Errorf("%q: %w %s", strings.Join(cmd.Args, " "), err, stderr.String())
+		return Format{}, fmt.Errorf("%q: %w %s", strings.Join(cmd.Args, " "), err, stdout.String())
 	}
 	var f md
 	if err := json.Unmarshal(stdout.Bytes(), &f); err != nil {