i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enabled a couple encoders and muxers, included files in build which we need

Browse Source 
for that...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32024 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-07-31 15:25:57 +00:00
parent 8f30149c06
commit f9acacb7d1
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/config.h
+33 -33
View File
@@ -104,12 +104,12 @@
#define CONFIG_BSFS 1 #define CONFIG_BSFS 1
#define CONFIG_DECODERS 1 #define CONFIG_DECODERS 1
#define CONFIG_DEMUXERS 1 #define CONFIG_DEMUXERS 1
#define CONFIG_ENCODERS 0 #define CONFIG_ENCODERS 1
#define CONFIG_FILTERS 1 #define CONFIG_FILTERS 1
#define CONFIG_INDEVS 0 #define CONFIG_INDEVS 0
#define CONFIG_MUXERS 1 #define CONFIG_MUXERS 1
#define CONFIG_OUTDEVS 0 #define CONFIG_OUTDEVS 0
#define CONFIG_PARSERS 0 #define CONFIG_PARSERS 1
#define CONFIG_PROTOCOLS 1 #define CONFIG_PROTOCOLS 1
#define CONFIG_AANDCT 1 #define CONFIG_AANDCT 1
#define CONFIG_AVFILTER 0 #define CONFIG_AVFILTER 0
@@ -404,13 +404,13 @@
#define CONFIG_HUFFYUV_ENCODER 0 #define CONFIG_HUFFYUV_ENCODER 0
#define CONFIG_JPEGLS_ENCODER 0 #define CONFIG_JPEGLS_ENCODER 0
#define CONFIG_LJPEG_ENCODER 0 #define CONFIG_LJPEG_ENCODER 0
#define CONFIG_MJPEG_ENCODER 0 #define CONFIG_MJPEG_ENCODER 1
#define CONFIG_MPEG1VIDEO_ENCODER 0 #define CONFIG_MPEG1VIDEO_ENCODER 1
#define CONFIG_MPEG2VIDEO_ENCODER 0 #define CONFIG_MPEG2VIDEO_ENCODER 1
#define CONFIG_MPEG4_ENCODER 0 #define CONFIG_MPEG4_ENCODER 1
#define CONFIG_MSMPEG4V1_ENCODER 0 #define CONFIG_MSMPEG4V1_ENCODER 1
#define CONFIG_MSMPEG4V2_ENCODER 0 #define CONFIG_MSMPEG4V2_ENCODER 1
#define CONFIG_MSMPEG4V3_ENCODER 0 #define CONFIG_MSMPEG4V3_ENCODER 1
#define CONFIG_PAM_ENCODER 0 #define CONFIG_PAM_ENCODER 0
#define CONFIG_PBM_ENCODER 0 #define CONFIG_PBM_ENCODER 0
#define CONFIG_PGM_ENCODER 0 #define CONFIG_PGM_ENCODER 0
@@ -418,7 +418,7 @@
#define CONFIG_PNG_ENCODER 0 #define CONFIG_PNG_ENCODER 0
#define CONFIG_PPM_ENCODER 0 #define CONFIG_PPM_ENCODER 0
#define CONFIG_QTRLE_ENCODER 0 #define CONFIG_QTRLE_ENCODER 0
#define CONFIG_RAWVIDEO_ENCODER 0 #define CONFIG_RAWVIDEO_ENCODER 1
#define CONFIG_ROQ_ENCODER 0 #define CONFIG_ROQ_ENCODER 0
#define CONFIG_RV10_ENCODER 0 #define CONFIG_RV10_ENCODER 0
#define CONFIG_RV20_ENCODER 0 #define CONFIG_RV20_ENCODER 0
@@ -441,27 +441,27 @@
#define CONFIG_VORBIS_ENCODER 0 #define CONFIG_VORBIS_ENCODER 0
#define CONFIG_WMAV1_ENCODER 0 #define CONFIG_WMAV1_ENCODER 0
#define CONFIG_WMAV2_ENCODER 0 #define CONFIG_WMAV2_ENCODER 0
#define CONFIG_PCM_ALAW_ENCODER 0 #define CONFIG_PCM_ALAW_ENCODER 1
#define CONFIG_PCM_F32BE_ENCODER 0 #define CONFIG_PCM_F32BE_ENCODER 1
#define CONFIG_PCM_F32LE_ENCODER 0 #define CONFIG_PCM_F32LE_ENCODER 1
#define CONFIG_PCM_F64BE_ENCODER 0 #define CONFIG_PCM_F64BE_ENCODER 1
#define CONFIG_PCM_F64LE_ENCODER 0 #define CONFIG_PCM_F64LE_ENCODER 1
#define CONFIG_PCM_MULAW_ENCODER 0 #define CONFIG_PCM_MULAW_ENCODER 1
#define CONFIG_PCM_S8_ENCODER 0 #define CONFIG_PCM_S8_ENCODER 1
#define CONFIG_PCM_S16BE_ENCODER 0 #define CONFIG_PCM_S16BE_ENCODER 1
#define CONFIG_PCM_S16LE_ENCODER 0 #define CONFIG_PCM_S16LE_ENCODER 1
#define CONFIG_PCM_S24BE_ENCODER 0 #define CONFIG_PCM_S24BE_ENCODER 1
#define CONFIG_PCM_S24DAUD_ENCODER 0 #define CONFIG_PCM_S24DAUD_ENCODER 1
#define CONFIG_PCM_S24LE_ENCODER 0 #define CONFIG_PCM_S24LE_ENCODER 1
#define CONFIG_PCM_S32BE_ENCODER 0 #define CONFIG_PCM_S32BE_ENCODER 1
#define CONFIG_PCM_S32LE_ENCODER 0 #define CONFIG_PCM_S32LE_ENCODER 1
#define CONFIG_PCM_U8_ENCODER 0 #define CONFIG_PCM_U8_ENCODER 1
#define CONFIG_PCM_U16BE_ENCODER 0 #define CONFIG_PCM_U16BE_ENCODER 1
#define CONFIG_PCM_U16LE_ENCODER 0 #define CONFIG_PCM_U16LE_ENCODER 1
#define CONFIG_PCM_U24BE_ENCODER 0 #define CONFIG_PCM_U24BE_ENCODER 1
#define CONFIG_PCM_U24LE_ENCODER 0 #define CONFIG_PCM_U24LE_ENCODER 1
#define CONFIG_PCM_U32BE_ENCODER 0 #define CONFIG_PCM_U32BE_ENCODER 1
#define CONFIG_PCM_U32LE_ENCODER 0 #define CONFIG_PCM_U32LE_ENCODER 1
#define CONFIG_PCM_ZORK_ENCODER 0 #define CONFIG_PCM_ZORK_ENCODER 0
#define CONFIG_ROQ_DPCM_ENCODER 0 #define CONFIG_ROQ_DPCM_ENCODER 0
#define CONFIG_ADPCM_ADX_ENCODER 0 #define CONFIG_ADPCM_ADX_ENCODER 0
@@ -637,13 +637,13 @@
#define CONFIG_LIBNUT_DEMUXER 0 #define CONFIG_LIBNUT_DEMUXER 0
#define CONFIG_AC3_MUXER 0 #define CONFIG_AC3_MUXER 0
#define CONFIG_ADTS_MUXER 0 #define CONFIG_ADTS_MUXER 0
#define CONFIG_AIFF_MUXER 0 #define CONFIG_AIFF_MUXER 1
#define CONFIG_AMR_MUXER 0 #define CONFIG_AMR_MUXER 0
#define CONFIG_ASF_MUXER 0 #define CONFIG_ASF_MUXER 0
#define CONFIG_ASS_MUXER 0 #define CONFIG_ASS_MUXER 0
#define CONFIG_ASF_STREAM_MUXER 0 #define CONFIG_ASF_STREAM_MUXER 0
#define CONFIG_AU_MUXER 0 #define CONFIG_AU_MUXER 0
#define CONFIG_AVI_MUXER 0 #define CONFIG_AVI_MUXER 1
#define CONFIG_AVM2_MUXER 0 #define CONFIG_AVM2_MUXER 0
#define CONFIG_CRC_MUXER 0 #define CONFIG_CRC_MUXER 0
#define CONFIG_DAUD_MUXER 0 #define CONFIG_DAUD_MUXER 0
src/add-ons/media/plugins/ffmpeg/libavcodec/Jamfile
+8 -2
View File
@@ -150,6 +150,7 @@ StaticLibrary libavcodec.a :
mjpega_dump_header_bsf.c mjpega_dump_header_bsf.c
mjpegbdec.c mjpegbdec.c
mjpegdec.c mjpegdec.c
mjpegenc.c
mlp.c mlp.c
mlp_parser.c mlp_parser.c
mlpdec.c mlpdec.c
@@ -162,17 +163,21 @@ StaticLibrary libavcodec.a :
mpc.c mpc.c
mpc7.c mpc7.c
mpc8.c mpc8.c
mpeg12.c
mpeg12data.c
mpeg4audio.c mpeg4audio.c
mpeg4video_parser.c mpeg4video_parser.c
mpeg12.c
mpeg12data.c
mpeg12enc.c
mpegaudio.c mpegaudio.c
mpegaudio_parser.c mpegaudio_parser.c
mpegaudiodata.c mpegaudiodata.c
mpegaudiodec.c mpegaudiodec.c
mpegaudiodecheader.c mpegaudiodecheader.c
mpegaudioenc.c
mpegvideo.c mpegvideo.c
mpegvideo_enc.c
mpegvideo_parser.c mpegvideo_parser.c
# mpegvideo_xvmc.c
msmpeg4.c msmpeg4.c
msmpeg4data.c msmpeg4data.c
msrle.c msrle.c
@@ -206,6 +211,7 @@ StaticLibrary libavcodec.a :
ratecontrol.c ratecontrol.c
raw.c raw.c
rawdec.c rawdec.c
rawenc.c
rdft.c rdft.c
remove_extradata_bsf.c remove_extradata_bsf.c
resample.c resample.c
src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
+1 -1
View File
@@ -19,7 +19,7 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
cpuid.c cpuid.c
cavsdsp_mmx.c cavsdsp_mmx.c
dsputil_mmx.c dsputil_mmx.c
# dsputilenc_mmx.c # For when we enable encoders. dsputilenc_mmx.c
fdct_mmx.c fdct_mmx.c
# idct_mmx.c # GPL # idct_mmx.c # GPL
idct_mmx_xvid.c idct_mmx_xvid.c