diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.cpp b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
index a16638e..e864663 100644
--- a/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
+++ b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
@@ -521,10 +521,17 @@ void avfDecoder::run()
                        !m_userStop && m_seekTime <= 0.0)
                 {
                     int ret;
-                    ret = AudioOutputUtil::DecodeAudio(m_audioDec,
-                                                       m_outputBuffer + m_outputAt,
-                                                       data_size,
-                                                       &tmp_pkt);
+                    if (output())
+                    {
+                        ret = output()->DecodeAudio(m_audioDec,
+                                                    m_outputBuffer + m_outputAt,
+                                                    data_size,
+                                                    &tmp_pkt);
+                    }
+                    else
+                    {
+                        ret = tmp_pkt.size;
+                    }
                     if (ret < 0)
                         break;