diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-09-27 15:02:50 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-09-27 15:02:50 +0300 |
| commit | 2ae5c07dc74b7771557de4c171d610e9d137da60 (patch) | |
| tree | 2fc76cdb2af4ba0d00c632e61fea4361d97d45c2 | |
| parent | e6ed5771c5caf6a714f3fa7fa47cec2b55f3fd33 (diff) | |
| download | xine-lib-2ae5c07dc74b7771557de4c171d610e9d137da60.tar.gz xine-lib-2ae5c07dc74b7771557de4c171d610e9d137da60.tar.bz2 | |
ff_audio_open_codec(): initialize codec if it hasn't been initialized.
This makes HEADERS optional for codecs that don't require extradata.
imported patch 10124.diff
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 0bd947d42..31287fd3d 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -170,6 +170,10 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ static int ff_audio_open_codec(ff_audio_decoder_t *this, unsigned int codec_type) { if ( !this->codec ) { + ff_audio_init_codec(this, codec_type); + } + + if ( !this->codec ) { xprintf (this->stream->xine, XINE_VERBOSITY_LOG, _("ffmpeg_audio_dec: trying to open null codec\n")); _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0); |