diff options
| author | Max Kellermann <max@duempel.org> | 2011-07-20 21:46:05 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-07-20 21:46:05 +0200 |
| commit | 0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3 (patch) | |
| tree | d08d18c852febad9d6da94dfbe31545dcf93b5d0 /src/output/shout_plugin.c | |
| parent | 57936a13741c09fa54a33a53ed05ac0d996e4807 (diff) | |
| parent | 838f7cd210dbd3f071d48d54c168c123c3d20c58 (diff) | |
| download | mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.gz mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.xz mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/player_thread.c
src/playlist_control.c
Diffstat (limited to 'src/output/shout_plugin.c')
| -rw-r--r-- | src/output/shout_plugin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index ec5fca3d9..7a4d70e70 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -518,7 +518,7 @@ static void my_shout_set_tag(void *data, if (sd->encoder->plugin->tag != NULL) { /* encoder plugin supports stream tags */ - ret = encoder_flush(sd->encoder, &error); + ret = encoder_pre_tag(sd->encoder, &error); if (!ret) { g_warning("%s", error->message); g_error_free(error); |