diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-03-11 23:43:58 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-03-11 23:43:58 +0000 |
| commit | 0e27a3976b6b5eaab4983b3e63a7009fe77451cf (patch) | |
| tree | 133a6a7103a5945213c1fe8ceacc273f6a73a59e /src | |
| parent | a1bc7578243bd93e106fc426374363da16652797 (diff) | |
| download | xine-lib-0e27a3976b6b5eaab4983b3e63a7009fe77451cf.tar.gz xine-lib-0e27a3976b6b5eaab4983b3e63a7009fe77451cf.tar.bz2 | |
libdivx4 doesn't handle 3ivx, corrected misleading error message
CVS patchset: 1557
CVS date: 2002/03/11 23:43:58
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_avi.c | 10 | ||||
| -rw-r--r-- | src/libdivx4/xine_decoder.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 3abe24e1b..e3ce6013b 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.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: demux_avi.c,v 1.65 2002/03/11 12:31:24 guenter Exp $ + * $Id: demux_avi.c,v 1.66 2002/03/11 23:43:58 guenter Exp $ * * demultiplexer for avi streams * @@ -1032,11 +1032,11 @@ static void demux_avi_start (demux_plugin_t *this_gen, this->avi->video_type = fourcc_to_buf_video((void*)&this->avi->bih.biCompression); if ( !this->avi->video_type ) { - LOG_MSG(this->xine, _("demux_avi: unknown avi format %.4s\n"), - (char*)&this->avi->bih.biCompression); + LOG_MSG(this->xine, _("demux_avi: unknown video codec '%.4s'\n"), + (char*)&this->avi->bih.biCompression); - this->status = DEMUX_FINISHED; - return; + this->status = DEMUX_FINISHED; + return; } buf->type = this->avi->video_type; LOG_MSG(this->xine, _("demux_avi: video codec >%s<\n"), buf_video_name(buf->type)); diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c index d5bdaca64..04d6c272a 100644 --- a/src/libdivx4/xine_decoder.c +++ b/src/libdivx4/xine_decoder.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2001 the xine project + * Copyright (C) 2001-2002 the xine project * - * This file is part of xine, a unix video player. + * This file is part of xine, a free video player. * * xine is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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.19 2002/03/11 12:31:25 guenter Exp $ + * $Id: xine_decoder.c,v 1.20 2002/03/11 23:43:58 guenter Exp $ * * xine decoder plugin using divx4 * @@ -237,12 +237,12 @@ static int divx4_init_decoder(divx4_decoder_t *this, buf_element_t *buf) case BUF_VIDEO_MSMPEG4_V3: this->use_311_compat = 1; break; - case BUF_VIDEO_MPEG4 : + case BUF_VIDEO_MPEG4: this->use_311_compat = 0; break; default: printf ("divx4: unknown video format (buftype: 0x%08X)\n", - buf->type & 0xFFFF0000); + buf->type & 0xFFFF0000); } /* setup decoder; inspired by avifile's plugin */ @@ -335,7 +335,7 @@ static int divx4_can_handle (video_decoder_t *this_gen, int buf_type) { /* divx4 currently does not support MSMPEG4 v1/v2 */ return ( (buf_type == BUF_VIDEO_MSMPEG4_V3 && this->can_handle_311) || /* buf_type == BUF_VIDEO_MSMPEG4_V12 || */ - buf_type == BUF_VIDEO_MPEG4 || buf_type == BUF_VIDEO_3IVX); + buf_type == BUF_VIDEO_MPEG4); } /* copied verbatim from ffmpeg plugin */ |