Skip to content

V
vlc-2-2
Commit a9511725 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* ffmpeg 0.4.8 compilation fix

parent 8d7e6b98
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ a9511725
...@@ -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.69 2004/01/08 00:12:50 gbazin Exp $ * $Id: ffmpeg.c,v 1.70 2004/01/08 12:07:07 hartman 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>
...@@ -436,11 +436,11 @@ static struct ...@@ -436,11 +436,11 @@ static struct
/* Flash (H263) variant */ /* Flash (H263) variant */
{ VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1, { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1,
VIDEO_ES, "Flash Video" }, VIDEO_ES, "Flash Video" },
#if LIBAVCODEC_BUILD > 4680
/* Flash (H263) variant */ /* Flash (H263) variant */
{ VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC, { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC,
VIDEO_ES, "Flic Video" }, VIDEO_ES, "Flic Video" },
#endif
/* MJPEG */ /* MJPEG */
{ VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG, { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG,
VIDEO_ES, "Motion JPEG Video" }, VIDEO_ES, "Motion JPEG Video" },
......
Markdown is supported
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