diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-01 17:56:05 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-01 17:56:05 +0000 |
| commit | 55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2 (patch) | |
| tree | a75e2ca408aa1dea4eab0ae04b34408cbc261011 /src/libdivx4/xine_decoder.c | |
| parent | e7eb5eea39cb19a939a519828be0879ba58d1805 (diff) | |
| download | xine-lib-55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2.tar.gz xine-lib-55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2.tar.bz2 | |
enable ffmpeg's msmpeg4 v1/v2.
note: i don't have any v1 streams to test. v2 are working fine though.
CVS patchset: 2189
CVS date: 2002/07/01 17:56:05
Diffstat (limited to 'src/libdivx4/xine_decoder.c')
| -rw-r--r-- | src/libdivx4/xine_decoder.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c index 930e3f79d..c5dfdb4b8 100644 --- a/src/libdivx4/xine_decoder.c +++ b/src/libdivx4/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.37 2002/06/12 12:22:35 f1rmb Exp $ + * $Id: xine_decoder.c,v 1.38 2002/07/01 17:56:05 miguelfreitas Exp $ * * xine decoder plugin using divx4 * @@ -231,7 +231,8 @@ static int divx4_init_decoder(divx4_decoder_t *this, buf_element_t *buf) { /* do we need divx 3.11 compatibility mode? */ switch (buf->type & 0xFFFF0000) { - case BUF_VIDEO_MSMPEG4_V12: + case BUF_VIDEO_MSMPEG4_V1: + case BUF_VIDEO_MSMPEG4_V2: case BUF_VIDEO_MSMPEG4_V3: if (this->version >= 20020303) { param.codec_version=311; @@ -353,7 +354,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_MSMPEG4_V2 || */ (buf_type == BUF_VIDEO_MPEG4) || (buf_type == BUF_VIDEO_DIVX5)); } |