summaryrefslogtreecommitdiff
path: root/src/libffmpeg/xine_decoder.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-08 01:02:27 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-08 01:02:27 +0000
commit89b2bf76f80eb05badeb340e2a00a8fbb6e17db3 (patch)
treedfd705e620522f0f22fa957ac403ee2923420274 /src/libffmpeg/xine_decoder.c
parent183830cbd2d23d2e616b617b1f5c7ab6867882b1 (diff)
downloadxine-lib-89b2bf76f80eb05badeb340e2a00a8fbb6e17db3.tar.gz
xine-lib-89b2bf76f80eb05badeb340e2a00a8fbb6e17db3.tar.bz2
fixes/cleanups of the handled/unhandled codecs
for more information see message on xine-devel CVS patchset: 3818 CVS date: 2003/01/08 01:02:27
Diffstat (limited to 'src/libffmpeg/xine_decoder.c')
-rw-r--r--src/libffmpeg/xine_decoder.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 695635e6f..f844f8ee2 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.84 2003/01/07 16:36:52 hadess Exp $
+ * $Id: xine_decoder.c,v 1.85 2003/01/08 01:02:29 miguelfreitas Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -141,11 +141,10 @@ static void init_video_codec (ff_video_decoder_t *this, xine_bmiheader *bih) {
if (avcodec_open (this->context, this->codec) < 0) {
printf ("ffmpeg: couldn't open decoder\n");
free(this->context);
+ this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 0;
return;
}
- this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
-
this->decoder_ok = 1;
this->stream->video_out->open (this->stream->video_out, this->stream);
@@ -830,11 +829,10 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
if (avcodec_open (this->context, this->codec) < 0) {
printf ("ffmpeg: couldn't open decoder\n");
+ this->stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 0;
return;
}
- this->stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 1;
-
this->decoder_ok = 1;
return;