From: Laurent Aimar Date: Fri, 15 Aug 2003 13:16:38 +0000 (+0000) Subject: * ffmpeg: added m4cc and M4CC as MPEG4 fourcc. X-Git-Tag: 0.7.0~1124 X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=4be60f726462456946b39a4f7b5850b6b2f8c752 * ffmpeg: added m4cc and M4CC as MPEG4 fourcc. --- diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index 42267baa08..2e8702d2b2 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -2,7 +2,7 @@ * ffmpeg.c: video decoder using ffmpeg library ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ffmpeg.c,v 1.47 2003/08/08 17:08:32 gbazin Exp $ + * $Id: ffmpeg.c,v 1.48 2003/08/15 13:16:38 fenrir Exp $ * * Authors: Laurent Aimar * @@ -504,6 +504,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc, case FOURCC_DX50: case FOURCC_mp4v: case FOURCC_4: + case FOURCC_m4cc: + case FOURCC_M4CC: /* 3iv1 is unsupported by ffmpeg putting it here gives extreme distorted images case FOURCC_3IV1: diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h index 833a793cce..570addb970 100644 --- a/modules/codec/ffmpeg/ffmpeg.h +++ b/modules/codec/ffmpeg/ffmpeg.h @@ -2,7 +2,7 @@ * ffmpeg_vdec.h: video decoder using ffmpeg library ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: ffmpeg.h,v 1.22 2003/08/08 17:08:32 gbazin Exp $ + * $Id: ffmpeg.h,v 1.23 2003/08/15 13:16:38 fenrir Exp $ * * Authors: Laurent Aimar * @@ -88,6 +88,8 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes ); #define FOURCC_DX50 VLC_FOURCC('D','X','5','0') #define FOURCC_mp4v VLC_FOURCC('m','p','4','v') #define FOURCC_4 VLC_FOURCC( 4, 0, 0, 0 ) +#define FOURCC_m4cc VLC_FOURCC('m','4','c','c') +#define FOURCC_M4CC VLC_FOURCC('M','4','C','C') /* MSMPEG4 v2 */ #define FOURCC_MPG4 VLC_FOURCC('M','P','G','4')