Reenable MPEG4 audio with fix for failure case.

Audio out was opened with bogus settings (1Hz != 0) which failed. This prevented
a retry after first audio frame came in and corrected the settings (48k/6
channels). Once ao _is_ open successfully, everything works same as before,
including further stream conf changes.

1 files changed, 7 insertions, 8 deletions

diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index 20e4c5d57..205a64370 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -581,14 +581,13 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
           return;
         }
 
-        if (this->output_open) {
-          if (this->audio_bits        != this->context->bits_per_sample ||
-              this->audio_sample_rate != this->context->sample_rate ||
-              this->audio_channels    != this->context->channels) {
-            xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                    _("ffmpeg_audio_dec: codec parameters changed\n"));
-            ff_audio_output_close(this);
-          }
+        if (this->audio_bits        != this->context->bits_per_sample ||
+            this->audio_sample_rate != this->context->sample_rate ||
+            this->audio_channels    != this->context->channels) {
+          xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+                  _("ffmpeg_audio_dec: codec parameters changed\n"));
+          /* close if it was open, and always trigger 1 new open attempt below */
+          ff_audio_output_close(this);
         }
 
 	if (!this->output_open) {