August 2008 - MPlayer-cvslog - lists.mplayerhq.hu

r27472 - trunk/etc/codecs.conf
by diego 21 Aug '08

21 Aug '08

Author: diego Date: Thu Aug 21 11:52:47 2008 New Revision: 27472 Log: cosmetics: Remove trailing whitespace and tabs. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Thu Aug 21 11:52:47 2008 @@ -642,16 +642,16 @@ videocodec ffdivx status working fourcc MPG3,mpg3 div3 fourcc MP43,mp43 div3 ; MSMPEG-4 v3 (fourcc mapping to div3) - fourcc DIV5,div5 div3 ; DivX 3.20 + fourcc DIV5,div5 div3 ; DivX 3.20 fourcc DIV6,div6 div4 ; -||- fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff + fourcc AP41 div3 ; AngelPotion stuff fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax) - fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com) + fourcc 3IVD,3ivd ; divxdoctored files (3ivx.com) driver ffmpeg dll msmpeg4 out YV12,I420,IYUV - + videocodec ffmp42 info "FFmpeg MSMPEG-4 v2" status working @@ -693,7 +693,7 @@ videocodec ffwmv3 driver ffmpeg dll wmv3 out YV12,I420,IYUV - + videocodec ffvc1 info "FFmpeg WVC1" status buggy @@ -728,7 +728,7 @@ videocodec ffodivx fourcc FMP4,fmp4 fourcc DIVX,divx fourcc DIV1,div1 divx - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 + fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc M4S2,m4s2 fourcc xvid,XVID,XviD,XVIX fourcc DX50,dx50,BLZ0 DX50 @@ -736,7 +736,7 @@ videocodec ffodivx format 0x4 fourcc UMP4 fourcc RMP4 - fourcc 3IV2,3iv2 ; 3ivx Delta 4 + fourcc 3IV2,3iv2 ; 3ivx Delta 4 fourcc DXGM fourcc SEDG ; diskless camcorder Samsung Miniket VP-M110 fourcc SMP4,smp4 ; Samsung SMP4 video codec @@ -807,9 +807,9 @@ videocodec divx4vfw comment "sig11 with -framedrop" fourcc DIVX,divx ; opendivx / divx4 fourcc DIV1,div1 divx -; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 +; fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc MP43,mp43,DIV3,div3,DIV4,div4 DIV3 ; for DivX4Linux only! - fourcc AP41 DIV3 ; AngelPotion stuff + fourcc AP41 DIV3 ; AngelPotion stuff format 0x4 driver vfw dll "divx.dll" @@ -827,7 +827,7 @@ videocodec divxds fourcc DIV5,div5 div3 fourcc DIV6,div6 div4 fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff + fourcc AP41 div3 ; AngelPotion stuff driver dshow dll "divx_c32.ax" guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa @@ -838,15 +838,15 @@ videocodec divx info "DivX ;-) (MSMPEG-4 v3)" status working fourcc MP43,mp43 div3 ; MSMPEG-4 v3 (fourcc mapping to div3) - fourcc DIV5,div5 div3 ; DivX 3.20 + fourcc DIV5,div5 div3 ; DivX 3.20 fourcc DIV6,div6 div4 ; -||- fourcc DIV3,div3,DIV4,div4 - fourcc AP41 div3 ; AngelPotion stuff + fourcc AP41 div3 ; AngelPotion stuff driver vfw dll "divxc32.dll" out YUY2 yuvhack out BGR32,BGR24,BGR15 - + ; hmm. we should check, maybe these are/will be playable with libavcodec: videocodec mpeg4ds @@ -854,7 +854,7 @@ videocodec mpeg4ds status working comment "with postprocessing" fourcc DIV2,div2 mp42 - fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 + fourcc MP4S,mp4s ; ISO MPEG-4 Video V1 fourcc MPG4,mpg4 fourcc MP42,mp42 driver dshow @@ -1106,8 +1106,8 @@ videocodec pegasusm status crashing fourcc MJPG driver vfw -; dll "pvmjpg20.dll" ; v2.0 - dll "pvmjpg21.dll" ; v2.1 +; dll "pvmjpg20.dll" ; v2.0 + dll "pvmjpg21.dll" ; v2.1 out BGR24 flip videocodec pegasusl @@ -1466,7 +1466,7 @@ videocodec ffrv20 driver ffmpeg dll rv20 out YV12,I420,IYUV - + videocodec rv20 info "Linux RealPlayer 8 RV20 decoder" status working @@ -2522,7 +2522,7 @@ videocodec rawy800 info "RAW Y8/Y800" status working driver raw - format 0x0 + format 0x0 format 0x20203859 ; "Y8 " fourcc y800,Y800 out Y800,Y8 @@ -3197,7 +3197,7 @@ audiocodec imaadpcmacm format 0x11 driver acm dll "imaadp32.acm" - + audiocodec msgsm info "MS GSM" status working @@ -3439,8 +3439,8 @@ audiocodec g72x info "G.711/G.721/G.723" status crashing comment "does not work yet - just noise :(" - format 0x111 ; vivo g.723 - format 0x112 ; vivo siren + format 0x111 ; vivo g.723 + format 0x112 ; vivo siren driver g72x dll "g72x.c"

1 0

r26723 - in trunk: Makefile av_opts.c av_opts.h
by michael 18 Aug '08

18 Aug '08

Author: michael Date: Sat May 10 20:54:10 2008 New Revision: 26723 Log: AVOptions support. Added: trunk/av_opts.c trunk/av_opts.h Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sat May 10 20:54:10 2008 @@ -261,7 +261,8 @@ SRCS_COMMON-$(LIBASS) += libass/ass_utils.c \ libmpcodecs/vf_ass.c \ -SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c \ +SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ + libaf/af_lavcresample.c \ libmpcodecs/ad_ffmpeg.c \ libmpcodecs/vd_ffmpeg.c \ libmpcodecs/vf_lavc.c \ Added: trunk/av_opts.c ============================================================================== --- (empty file) +++ trunk/av_opts.c Sat May 10 20:54:10 2008 @@ -0,0 +1,27 @@ +#include <stdlib.h> +#include <string.h> +#include "libavcodec/opt.h" + +int parse_avopts(void *v, char *str){ + char *start; + start= str= strdup(str); + + while(str && *str){ + char *next_opt, *arg; + + next_opt= strchr(str, ','); + if(next_opt) *next_opt++= 0; + + arg = strchr(str, '='); + if(arg) *arg++= 0; + + if(!av_set_string(v, str, arg)){ + free(start); + return -1; + } + str= next_opt; + } + + free(start); + return 0; +} \ No newline at end of file Added: trunk/av_opts.h ============================================================================== --- (empty file) +++ trunk/av_opts.h Sat May 10 20:54:10 2008 @@ -0,0 +1,5 @@ + +/** + * Parses str and sets AVOptions in v accordingly. + */ +int parse_avopts(void *v, char *str); \ No newline at end of file

6 21

r27471 - trunk/Makefile
by diego 18 Aug '08

18 Aug '08

Author: diego Date: Mon Aug 18 08:30:10 2008 New Revision: 27471 Log: Remove SKIP_DEPS trick. The same effect can be achieved without it. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Aug 18 08:30:10 2008 @@ -1056,13 +1056,10 @@ dhahelperwinclean: -# Do not include dependencies when they are about to be removed anyway -# or if SKIP_DEPS was set to "yes" on the command line. +# Do not include dependencies when they are about to be removed anyway. ifneq ($(MAKECMDGOALS),distclean) -ifneq ($(SKIP_DEPS),yes) -include $(DEPS) endif -endif .PHONY: all doxygen *install* *tools drivers dhahelper* .PHONY: checkheaders *clean dep depend tests

1 0

r27470 - in trunk/liba52: bitstream.h liba52_changes.diff
by diego 17 Aug '08

17 Aug '08

Author: diego Date: Mon Aug 18 00:32:30 2008 New Revision: 27470 Log: fix for alignment problem on older ARM cores patch by Siarhei Siamashka, siarhei.siamashka gmail com Modified: trunk/liba52/bitstream.h trunk/liba52/liba52_changes.diff Modified: trunk/liba52/bitstream.h ============================================================================== --- trunk/liba52/bitstream.h (original) +++ trunk/liba52/bitstream.h Mon Aug 18 00:32:30 2008 @@ -43,7 +43,7 @@ #define ALT_BITSTREAM_READER /* used to avoid misaligned exceptions on some archs (alpha, ...) */ -#if defined (ARCH_X86) || defined(ARCH_ARMV4L) +#if defined (ARCH_X86) || defined(HAVE_ARMV6) # define unaligned32(a) (*(uint32_t*)(a)) #else # ifdef __GNUC__ Modified: trunk/liba52/liba52_changes.diff ============================================================================== --- trunk/liba52/liba52_changes.diff (original) +++ trunk/liba52/liba52_changes.diff Mon Aug 18 00:32:30 2008 @@ -97,7 +97,7 @@ +#define ALT_BITSTREAM_READER + +/* used to avoid misaligned exceptions on some archs (alpha, ...) */ -+#if defined (ARCH_X86) || defined(ARCH_ARMV4L) ++#if defined (ARCH_X86) || defined(HAVE_ARMV6) +# define unaligned32(a) (*(uint32_t*)(a)) +#else +# ifdef __GNUC__

1 0

r27469 - trunk/configure
by diego 17 Aug '08

17 Aug '08

Author: diego Date: Mon Aug 18 00:02:05 2008 New Revision: 27469 Log: Add check for ARM VFP instructions. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Aug 18 00:02:05 2008 @@ -431,6 +431,7 @@ Advanced options: --enable-altivec enable AltiVec (PowerPC) [autodetect] --enable-armv5te enable DSP extensions (ARM) [autodetect] --enable-armv6 enable ARMv6 (ARM) [autodetect] + --enable-armvfp enable ARM VFP (ARM) [autodetect] --enable-iwmmxt enable iWMMXt (ARM) [autodetect] --disable-fastmemcpy disable 3DNow!/SSE/MMX optimized memcpy [enable] --enable-big-endian force byte order to big-endian [autodetect] @@ -479,6 +480,7 @@ _cmov=auto _fast_cmov=auto _armv5te=auto _armv6=auto +_armvfp=auto _iwmmxt=auto _mtrr=auto _altivec=auto @@ -1221,6 +1223,8 @@ for ac_option do --disable-armv5te) _armv5te=no ;; --enable-armv6) _armv6=yes ;; --disable-armv6) _armv6=no ;; + --enable-armvfp) _armvfp=yes ;; + --disable-armvfp) _armvfp=no ;; --enable-iwmmxt) _iwmmxt=yes ;; --disable-iwmmxt) _iwmmxt=no ;; --enable-mmx) _mmx=yes ;; @@ -2502,6 +2506,16 @@ EOF fi echores "$_armv6" + echocheck "ARM VFP" + if test $_armvfp = "auto" ; then + cat > $TMPC << EOF +int main(void) { __asm__ __volatile__ ("fadds s0, s0, s0"); return 0; } +EOF + _armvfp=no + cc_check && _armvfp=yes + fi + echores "$_armvfp" + echocheck "iWMMXt (Intel XScale SIMD instructions)" if test $_iwmmxt = "auto" ; then cat > $TMPC << EOF @@ -2513,7 +2527,7 @@ EOF echores "$_iwmmxt" fi -_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV ARMV5TE ARMV6 IWMMXT MLIB MMI SH4 VIS MVI' +_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEX SSE SSE2 SSSE3 FAST_CMOV CMOV ARMV5TE ARMV6 ARMVFP IWMMXT MLIB MMI SH4 VIS MVI' test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts" test "$_mmx" = yes && _cpuexts="MMX $_cpuexts" test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts" @@ -2526,6 +2540,7 @@ test "$_cmov" = yes && _cpuexts="CM test "$_fast_cmov" = yes && _cpuexts="FAST_CMOV $_cpuexts" test "$_armv5te" = yes && _cpuexts="ARMV5TE $_cpuexts" test "$_armv6" = yes && _cpuexts="ARMV6 $_cpuexts" +test "$_armvfp" = yes && _cpuexts="ARMVFP $_cpuexts" test "$_iwmmxt" = yes && _cpuexts="IWMMXT $_cpuexts" test "$_vis" = yes && _cpuexts="VIS $_cpuexts" test "$_mvi" = yes && _cpuexts="MVI $_cpuexts"

1 0

r27467 - trunk/libao2/ao_nas.c
by diego 15 Aug '08

15 Aug '08

Author: diego Date: Fri Aug 15 19:14:53 2008 New Revision: 27467 Log: Work correctly with very small files where less than outburst is to be played. patch by Tobias Diedrich, ranma tdiedrich de Modified: trunk/libao2/ao_nas.c Modified: trunk/libao2/ao_nas.c ============================================================================== --- trunk/libao2/ao_nas.c (original) +++ trunk/libao2/ao_nas.c Fri Aug 15 19:14:53 2008 @@ -574,6 +574,29 @@ static int play(void* data,int len,int f if (len == 0) return 0; + if (len < ao_data.outburst) { + unsigned tempbufsz = ao_data.outburst; + void *tempbuf = malloc(tempbufsz); + + memset(tempbuf, 0, tempbufsz); + memcpy(tempbuf, data, len); + + play(tempbuf, ao_data.outburst, flags); + + if (nas_data->state != AuStateStart) { + mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: play(): Starting flow.\n"); + nas_data->expect_underrun = 1; + nas_data->state = AuStateStart; + AuStartFlow(nas_data->aud, nas_data->flow, &as); + if (as != AuSuccess) + nas_print_error(nas_data->aud, "play(): AuStartFlow", as); + } + + free(tempbuf); + + return len; + } + pthread_mutex_lock(&nas_data->buffer_mutex); maxbursts = (nas_data->client_buffer_size - nas_data->client_buffer_used) / ao_data.outburst;

1 0

r27465 - trunk/Makefile
by diego 14 Aug '08

14 Aug '08

Author: diego Date: Thu Aug 14 22:42:54 2008 New Revision: 27465 Log: FFmpeg no longer has fastmemcpy support, so no longer trigger recursing into the FFmpeg directories if libvo/fastmemcpy.h changed. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Thu Aug 14 22:42:54 2008 @@ -741,7 +741,7 @@ checkheaders: $(ALLHEADERS:.h=.ho) dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done -$(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h +$(FFMPEGLIBS): $(FFMPEGFILES) config.h $(MAKE) -C $(@D) touch $@

1 0

r27464 - trunk/libmpcodecs/vd_qtvideo.c
by diego 14 Aug '08

14 Aug '08

Author: diego Date: Thu Aug 14 18:04:32 2008 New Revision: 27464 Log: Remove unused static declarations, fixes the warnings: libmpcodecs/vd_qtvideo.c:69: warning: 'ImageCodecDrawBand' defined but not used libmpcodecs/vd_qtvideo.c:71: warning: 'ImageCodecEndBand' defined but not used Modified: trunk/libmpcodecs/vd_qtvideo.c Modified: trunk/libmpcodecs/vd_qtvideo.c ============================================================================== --- trunk/libmpcodecs/vd_qtvideo.c (original) +++ trunk/libmpcodecs/vd_qtvideo.c Thu Aug 14 18:04:32 2008 @@ -66,12 +66,6 @@ static ComponentResult (*ImageCodecBe CodecDecompressParams * params, ImageSubCodecDecompressRecord * drp, long flags); -static ComponentResult (*ImageCodecDrawBand)(ComponentInstance ci, - ImageSubCodecDecompressRecord * drp); -static ComponentResult (*ImageCodecEndBand)(ComponentInstance ci, - ImageSubCodecDecompressRecord * drp, - OSErr result, - long flags); static ComponentResult (*ImageCodecGetCodecInfo)(ComponentInstance ci, CodecInfo * info); static ComponentResult (*ImageCodecPreDecompress)(ComponentInstance ci,

1 0

r27463 - in trunk: configure libao2/ao_mpegpes.c libvo/vo_mpegpes.c stream/dvb_tune.c stream/stream_dvb.c stream/stream_pvr.c
by diego 14 Aug '08

14 Aug '08

Author: diego Date: Thu Aug 14 17:54:53 2008 New Revision: 27463 Log: Use '#include <poll.h>' instead of '#include <sys/poll.h>'. It is the standard location as defined by the Open Group. Modified: trunk/configure trunk/libao2/ao_mpegpes.c trunk/libvo/vo_mpegpes.c trunk/stream/dvb_tune.c trunk/stream/stream_dvb.c trunk/stream/stream_pvr.c Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu Aug 14 17:54:53 2008 @@ -4529,7 +4529,7 @@ echocheck "DVB" if test "$_dvb" = auto ; then _dvb=no cat >$TMPC << EOF -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #include <stdio.h> #include <time.h> @@ -4559,7 +4559,7 @@ if test "$_dvbhead" = auto ; then _dvbhead=no cat >$TMPC << EOF -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #include <stdio.h> #include <time.h> Modified: trunk/libao2/ao_mpegpes.c ============================================================================== --- trunk/libao2/ao_mpegpes.c (original) +++ trunk/libao2/ao_mpegpes.c Thu Aug 14 17:54:53 2008 @@ -11,7 +11,7 @@ #include "config.h" #ifdef CONFIG_DVB -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #endif Modified: trunk/libvo/vo_mpegpes.c ============================================================================== --- trunk/libvo/vo_mpegpes.c (original) +++ trunk/libvo/vo_mpegpes.c Thu Aug 14 17:54:53 2008 @@ -26,7 +26,7 @@ #ifdef CONFIG_DVB #ifndef CONFIG_DVB_HEAD -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #include <stdio.h> @@ -41,7 +41,7 @@ #else #define true 1 #define false 0 -#include <sys/poll.h> +#include <poll.h> #include <sys/ioctl.h> #include <stdio.h> Modified: trunk/stream/dvb_tune.c ============================================================================== --- trunk/stream/dvb_tune.c (original) +++ trunk/stream/dvb_tune.c Thu Aug 14 17:54:53 2008 @@ -27,7 +27,7 @@ #include <stdlib.h> #include <ctype.h> #include <sys/ioctl.h> -#include <sys/poll.h> +#include <poll.h> #include <unistd.h> #include <fcntl.h> #include <time.h> Modified: trunk/stream/stream_dvb.c ============================================================================== --- trunk/stream/stream_dvb.c (original) +++ trunk/stream/stream_dvb.c Thu Aug 14 17:54:53 2008 @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <ctype.h> #include <sys/ioctl.h> #include <sys/time.h> -#include <sys/poll.h> +#include <poll.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> Modified: trunk/stream/stream_pvr.c ============================================================================== --- trunk/stream/stream_pvr.c (original) +++ trunk/stream/stream_pvr.c Thu Aug 14 17:54:53 2008 @@ -36,7 +36,7 @@ #include <sys/ioctl.h> #include <sys/fcntl.h> #include <inttypes.h> -#include <sys/poll.h> +#include <poll.h> #include <linux/types.h> #include <linux/videodev2.h>

1 0

r27462 - in trunk: libao2/ao_mpegpes.c libvo/vo_mpegpes.c
by diego 14 Aug '08

14 Aug '08

Author: diego Date: Thu Aug 14 17:48:11 2008 New Revision: 27462 Log: 100l: Rename missed preprocessor directives from a HAVE_ prefix to CONFIG_. Modified: trunk/libao2/ao_mpegpes.c trunk/libvo/vo_mpegpes.c Modified: trunk/libao2/ao_mpegpes.c ============================================================================== --- trunk/libao2/ao_mpegpes.c (original) +++ trunk/libao2/ao_mpegpes.c Thu Aug 14 17:48:11 2008 @@ -10,7 +10,7 @@ #include "config.h" -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #include <sys/poll.h> #include <sys/ioctl.h> #endif @@ -25,8 +25,8 @@ #include "mp_msg.h" #include "help_mp.h" -#ifdef HAVE_DVB -#ifndef HAVE_DVB_HEAD +#ifdef CONFIG_DVB +#ifndef CONFIG_DVB_HEAD #include <ost/audio.h> audioMixer_t dvb_mixer={255,255}; #else @@ -45,7 +45,7 @@ int vo_mpegpes_fd2 = -1; static ao_info_t info = { -#ifdef HAVE_DVB +#ifdef CONFIG_DVB "DVB audio output", #else "MPEG-PES audio output", @@ -60,7 +60,7 @@ LIBAO_EXTERN(mpegpes) // to set/get/query special features/parameters static int control(int cmd,void *arg){ -#ifdef HAVE_DVB +#ifdef CONFIG_DVB switch(cmd){ case AOCONTROL_GET_VOLUME: if(vo_mpegpes_fd2>=0){ @@ -92,11 +92,11 @@ static int control(int cmd,void *arg){ static int freq=0; static int freq_id=0; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB static int init_device(int card) { char ao_file[30]; -#ifndef HAVE_DVB_HEAD +#ifndef CONFIG_DVB_HEAD mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/audio\n"); sprintf(ao_file, "/dev/ost/audio"); #else @@ -171,7 +171,7 @@ static int preinit(const char *arg) } card--; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB if(!ao_file) return init_device(card); #else @@ -190,7 +190,7 @@ static int preinit(const char *arg) static int my_ao_write(unsigned char* data,int len){ int orig_len = len; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #define NFD 1 struct pollfd pfd[NFD]; Modified: trunk/libvo/vo_mpegpes.c ============================================================================== --- trunk/libvo/vo_mpegpes.c (original) +++ trunk/libvo/vo_mpegpes.c Thu Aug 14 17:48:11 2008 @@ -24,8 +24,8 @@ #include "mp_msg.h" -#ifdef HAVE_DVB -#ifndef HAVE_DVB_HEAD +#ifdef CONFIG_DVB +#ifndef CONFIG_DVB_HEAD #include <sys/poll.h> #include <sys/ioctl.h> @@ -64,7 +64,7 @@ extern int vo_mpegpes_fd2; static const vo_info_t info = { -#ifdef HAVE_DVB +#ifdef CONFIG_DVB "MPEG-PES to DVB card", #else "MPEG-PES file", @@ -79,7 +79,7 @@ const LIBVO_EXTERN (mpegpes) static int config(uint32_t s_width, uint32_t s_height, uint32_t width, uint32_t height, uint32_t flags, char *title, uint32_t format) { -#ifdef HAVE_DVB +#ifdef CONFIG_DVB switch(s_height){ case 288: case 576: @@ -95,7 +95,7 @@ config(uint32_t s_width, uint32_t s_heig } static int preinit(const char *arg){ -#ifdef HAVE_DVB +#ifdef CONFIG_DVB int card = -1; char vo_file[30], ao_file[30], *tmp; @@ -128,7 +128,7 @@ static int preinit(const char *arg){ mp_msg(MSGT_VO,MSGL_INFO, "Couldn't find a usable dvb video device, exiting\n"); return -1; } -#ifndef HAVE_DVB_HEAD +#ifndef CONFIG_DVB_HEAD mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/video+audio\n"); sprintf(vo_file, "/dev/ost/video"); sprintf(ao_file, "/dev/ost/audio"); @@ -174,7 +174,7 @@ static void draw_osd(void) static int my_write(unsigned char* data,int len){ int orig_len = len; -#ifdef HAVE_DVB +#ifdef CONFIG_DVB #define NFD 2 struct pollfd pfd[NFD];

1 0