diff options
| author | Max Kellermann <max@duempel.org> | 2012-04-05 00:45:39 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-04-05 00:45:39 +0200 |
| commit | c22cbbf8280bb35c8fee5ae3931d3bc08b70099f (patch) | |
| tree | 4654b9834f51c32746e2f72ce64191149647d87e /test/run_encoder.c | |
| parent | f930f37d35995f0fc07f70aefc41babc0db1757e (diff) | |
| parent | 5acee73fc85e44179120a5818247fc0760038cff (diff) | |
| download | mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.gz mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.tar.xz mpd-c22cbbf8280bb35c8fee5ae3931d3bc08b70099f.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/output/osx_plugin.c
src/text_input_stream.c
Diffstat (limited to 'test/run_encoder.c')
| -rw-r--r-- | test/run_encoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/run_encoder.c b/test/run_encoder.c index 3b3ec7240..6a4108620 100644 --- a/test/run_encoder.c +++ b/test/run_encoder.c @@ -121,7 +121,7 @@ int main(int argc, char **argv) encoder_to_stdout(encoder); } - ret = encoder_flush(encoder, &error); + ret = encoder_end(encoder, &error); if (!ret) { g_printerr("encoder_flush() failed: %s\n", error->message); |