Commit 7614ebe6 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

* all: added dx50 fourcc (just mpeg4 video).

parent fb1651c6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library * ffmpeg.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.65 2003/11/29 18:06:12 fenrir Exp $ * $Id: ffmpeg.c,v 1.66 2003/11/30 22:14:39 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -259,6 +259,7 @@ int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat, ...@@ -259,6 +259,7 @@ int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
case VLC_FOURCC('X','V','I','D'): case VLC_FOURCC('X','V','I','D'):
case VLC_FOURCC('X','v','i','D'): case VLC_FOURCC('X','v','i','D'):
case VLC_FOURCC('D','X','5','0'): case VLC_FOURCC('D','X','5','0'):
case VLC_FOURCC('d','x','5','0'):
case VLC_FOURCC('m','p','4','v'): case VLC_FOURCC('m','p','4','v'):
case VLC_FOURCC( 4, 0, 0, 0 ): case VLC_FOURCC( 4, 0, 0, 0 ):
case VLC_FOURCC('m','4','c','c'): case VLC_FOURCC('m','4','c','c'):
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc * avi.c : AVI file Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.79 2003/11/28 13:24:52 fenrir Exp $ * $Id: avi.c,v 1.80 2003/11/30 22:14:39 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -1096,7 +1096,7 @@ static int Control( input_thread_t *p_input, int i_query, va_list args ) ...@@ -1096,7 +1096,7 @@ static int Control( input_thread_t *p_input, int i_query, va_list args )
{ {
f = (double)va_arg( args, double ); f = (double)va_arg( args, double );
i64 = (mtime_t)(1000000.0 * p_sys->i_length * f ); i64 = (mtime_t)(1000000.0 * p_sys->i_length * f );
return Seek( p_input, i64, (int)(f * 100) ); return Seek( p_input, i64, (int)(f * 100) ) < 0 ? VLC_EGENERIC : VLC_SUCCESS;
} }
return demux_vaControlDefault( p_input, i_query, args ); return demux_vaControlDefault( p_input, i_query, args );
...@@ -1542,6 +1542,7 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec ) ...@@ -1542,6 +1542,7 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec )
case FOURCC_XVID: case FOURCC_XVID:
case FOURCC_XviD: case FOURCC_XviD:
case FOURCC_DX50: case FOURCC_DX50:
case FOURCC_dx50:
case FOURCC_mp4v: case FOURCC_mp4v:
case FOURCC_4: case FOURCC_4:
case FOURCC_3IV2: case FOURCC_3IV2:
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libavi.h : LibAVI library * libavi.h : LibAVI library
****************************************************************************** ******************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: libavi.h,v 1.12 2003/10/19 13:39:12 hartman Exp $ * $Id: libavi.h,v 1.13 2003/11/30 22:14:39 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -305,6 +305,7 @@ void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk ); ...@@ -305,6 +305,7 @@ void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk );
#define FOURCC_XVID VLC_FOURCC('X','V','I','D') #define FOURCC_XVID VLC_FOURCC('X','V','I','D')
#define FOURCC_XviD VLC_FOURCC('X','v','i','D') #define FOURCC_XviD VLC_FOURCC('X','v','i','D')
#define FOURCC_DX50 VLC_FOURCC('D','X','5','0') #define FOURCC_DX50 VLC_FOURCC('D','X','5','0')
#define FOURCC_dx50 VLC_FOURCC('d','x','5','0')
#define FOURCC_mp4v VLC_FOURCC('m','p','4','v') #define FOURCC_mp4v VLC_FOURCC('m','p','4','v')
#define FOURCC_4 VLC_FOURCC( 4, 0, 0, 0 ) #define FOURCC_4 VLC_FOURCC( 4, 0, 0, 0 )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg4video.c: mpeg 4 video packetizer * mpeg4video.c: mpeg 4 video packetizer
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: mpeg4video.c,v 1.17 2003/11/26 08:18:09 gbazin Exp $ * $Id: mpeg4video.c,v 1.18 2003/11/30 22:14:39 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -111,6 +111,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -111,6 +111,7 @@ static int Open( vlc_object_t *p_this )
case VLC_FOURCC( 'X', 'v', 'i', 'D'): case VLC_FOURCC( 'X', 'v', 'i', 'D'):
case VLC_FOURCC( 'x', 'v', 'i', 'd'): case VLC_FOURCC( 'x', 'v', 'i', 'd'):
case VLC_FOURCC( 'D', 'X', '5', '0'): case VLC_FOURCC( 'D', 'X', '5', '0'):
case VLC_FOURCC( 'd', 'x', '5', '0'):
case VLC_FOURCC( 0x04, 0, 0, 0): case VLC_FOURCC( 0x04, 0, 0, 0):
case VLC_FOURCC( '3', 'I', 'V', '2'): case VLC_FOURCC( '3', 'I', 'V', '2'):
break; break;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment