diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-09-15 15:10:15 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-09-15 15:10:15 +0300 |
| commit | 97cec62e0abfacdd0f89f211583f018f59a74c69 (patch) | |
| tree | 55e8290628f1d867be67bbb93546527ab1f1fe36 | |
| parent | 33045f759f0cb124cb8eb15ac317d5340644481e (diff) | |
| download | xine-lib-97cec62e0abfacdd0f89f211583f018f59a74c69.tar.gz xine-lib-97cec62e0abfacdd0f89f211583f018f59a74c69.tar.bz2 | |
ffmpeg audio: removed checks that are always true (context is allocated in init)
imported patch 10116.diff
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 34ccadeee..754de45be 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -299,7 +299,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) #endif if( !this->decoder_ok ) { - if ( ! this->context || ! this->codec ) { + 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); @@ -475,7 +475,7 @@ static void ff_audio_reset (audio_decoder_t *this_gen) { this->size = 0; /* try to reset the wma decoder */ - if( this->context && this->decoder_ok ) { + if( this->decoder_ok ) { pthread_mutex_lock (&ffmpeg_lock); avcodec_close (this->context); if (avcodec_open (this->context, this->codec) < 0) |