aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-10-02 00:36:05 +0200
committerMax Kellermann <max@duempel.org>2012-10-02 00:36:05 +0200
commitd95e538020531432642b7703f85608778a234d70 (patch)
treec13edf9fef7b92e82ccb5520f0f352dd0699a57c /test
parentaa171dcc18e9b341b313e5b9c065a9f8b73b9695 (diff)
parentadbe8c409a17b85ec10eb131fb81e3da9036dcef (diff)
downloadmpd-d95e538020531432642b7703f85608778a234d70.tar.gz
mpd-d95e538020531432642b7703f85608778a234d70.tar.xz
mpd-d95e538020531432642b7703f85608778a234d70.zip
Merge branch 'v0.17.x'
Diffstat (limited to 'test')
-rw-r--r--test/run_encoder.c5
-rw-r--r--test/test_vorbis_encoder.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/test/run_encoder.c b/test/run_encoder.c
index 6a4108620..db4d3af9b 100644
--- a/test/run_encoder.c
+++ b/test/run_encoder.c
@@ -99,14 +99,15 @@ int main(int argc, char **argv)
}
}
- ret = encoder_open(encoder, &audio_format, &error);
- if (encoder == NULL) {
+ if (!encoder_open(encoder, &audio_format, &error)) {
g_printerr("Failed to open encoder: %s\n",
error->message);
g_error_free(error);
return 1;
}
+ encoder_to_stdout(encoder);
+
/* do it */
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
diff --git a/test/test_vorbis_encoder.c b/test/test_vorbis_encoder.c
index 048d26f0a..619399159 100644
--- a/test/test_vorbis_encoder.c
+++ b/test/test_vorbis_encoder.c
@@ -67,6 +67,8 @@ main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
success = encoder_open(encoder, &audio_format, NULL);
assert(success);
+ encoder_to_stdout(encoder);
+
/* write a block of data */
success = encoder_write(encoder, zero, sizeof(zero), NULL);