Commit aeb8f859 authored by Laurent Aimar's avatar Laurent Aimar

* all : enable cinepak decoder, I hope I haven't break anything.

parent ff3794bc
...@@ -27,6 +27,7 @@ PLUGINS_DIR := a52 \ ...@@ -27,6 +27,7 @@ PLUGINS_DIR := a52 \
avi \ avi \
beos \ beos \
chroma \ chroma \
cinepak \
directx \ directx \
downmix \ downmix \
dsp \ dsp \
...@@ -55,6 +56,7 @@ PLUGINS_DIR := a52 \ ...@@ -55,6 +56,7 @@ PLUGINS_DIR := a52 \
mpeg_system \ mpeg_system \
mpeg_adec \ mpeg_adec \
mpeg_vdec \ mpeg_vdec \
mp4 \
network \ network \
ogg \ ogg \
qnx \ qnx \
...@@ -88,6 +90,7 @@ PLUGINS_TARGETS := a52/a52 \ ...@@ -88,6 +90,7 @@ PLUGINS_TARGETS := a52/a52 \
chroma/chroma_i422_yuy2_mmx \ chroma/chroma_i422_yuy2_mmx \
chroma/chroma_i420_ymga \ chroma/chroma_i420_ymga \
chroma/chroma_i420_ymga_mmx \ chroma/chroma_i420_ymga_mmx \
cinepak/cinepak \
directx/directx \ directx/directx \
downmix/downmix \ downmix/downmix \
downmix/downmixsse \ downmix/downmixsse \
...@@ -146,6 +149,7 @@ PLUGINS_TARGETS := a52/a52 \ ...@@ -146,6 +149,7 @@ PLUGINS_TARGETS := a52/a52 \
mpeg_system/mpeg_ts_dvbpsi \ mpeg_system/mpeg_ts_dvbpsi \
mpeg_adec/mpeg_adec \ mpeg_adec/mpeg_adec \
mpeg_vdec/mpeg_vdec \ mpeg_vdec/mpeg_vdec \
mp4/mp4 \
network/ipv4 \ network/ipv4 \
network/ipv6 \ network/ipv6 \
ogg/vorbis \ ogg/vorbis \
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1047,6 +1047,16 @@ then ...@@ -1047,6 +1047,16 @@ then
fi fi
fi fi
dnl
dnl cinepak plugin
dnl
AC_ARG_ENABLE(cinepak,
[ --enable-cinepak Cinepak decoder (default enabled)])
if test "x${enable_cinepak}" != "xno"
then
PLUGINS="${PLUGINS} cinepak"
fi
dnl dnl
dnl ogg vorbis plugin dnl ogg vorbis plugin
dnl dnl
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ext-dec.h: structures exported to the VideoLAN decoders * input_ext-dec.h: structures exported to the VideoLAN decoders
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: input_ext-dec.h,v 1.62 2002/07/20 18:01:41 sam Exp $ * $Id: input_ext-dec.h,v 1.63 2002/07/21 15:18:29 fenrir Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Kaempf <maxx@via.ecp.fr> * Michel Kaempf <maxx@via.ecp.fr>
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#define H263_VIDEO_ES 0x60 #define H263_VIDEO_ES 0x60
#define I263_VIDEO_ES 0x61 #define I263_VIDEO_ES 0x61
#define SVQ1_VIDEO_ES 0x62 #define SVQ1_VIDEO_ES 0x62
#define CINEPAK_VIDEO_ES 0x65
#define UNKNOWN_ES 0xFF #define UNKNOWN_ES 0xFF
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2002 VideoLAN * Copyright (C) 1999-2002 VideoLAN
* $Id: input_programs.c,v 1.91 2002/07/16 21:25:43 sam Exp $ * $Id: input_programs.c,v 1.92 2002/07/21 15:18:29 fenrir Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -693,6 +693,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -693,6 +693,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
case SVQ1_VIDEO_ES: case SVQ1_VIDEO_ES:
case H263_VIDEO_ES: case H263_VIDEO_ES:
case I263_VIDEO_ES: case I263_VIDEO_ES:
case CINEPAK_VIDEO_ES:
case DVD_SPU_ES: case DVD_SPU_ES:
if( config_GetInt( p_input, "video" ) ) if( config_GetInt( p_input, "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