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

r31986 - trunk/rpm/mplayer-codecs.spec
by rathann 20 Aug '10

20 Aug '10

Author: rathann Date: Fri Aug 20 20:19:11 2010 New Revision: 31986 Log: Update to include latest x86 binary codec packs. Modified: trunk/rpm/mplayer-codecs.spec Modified: trunk/rpm/mplayer-codecs.spec ============================================================================== --- trunk/rpm/mplayer-codecs.spec Fri Aug 20 17:48:09 2010 (r31985) +++ trunk/rpm/mplayer-codecs.spec Fri Aug 20 20:19:11 2010 (r31986) @@ -4,10 +4,10 @@ %define __spec_install_post %{nil} %define debug_package %{nil} -%define i386_ver 20061022 +%define i386_ver 20100303 %define ppc_ver 20061022 %define alpha_ver 20061028 -%define x86_64_ver 20061203 +%define x86_64_ver 20071007 %define ver %{expand:%{%{_target_cpu}_ver}} @@ -24,7 +24,7 @@ Source3: http://www.mplayerhq.hu/MPlayer License: Unknown ExclusiveArch: i386 ppc alpha x86_64 %ifarch i386 -Provides: w32codec +Provides: w32codec = %{version}-%{release} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) @@ -62,16 +62,16 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_codecsdir} %ifarch i386 -install -pm644 all-%{version}/* $RPM_BUILD_ROOT%{_codecsdir}/ +install -p all-%{version}/* $RPM_BUILD_ROOT%{_codecsdir}/ %endif %ifarch alpha -install -pm644 all-alpha-%{alpha_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ +install -p all-alpha-%{alpha_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ %endif %ifarch ppc -install -pm644 all-ppc-%{ppc_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ +install -p all-ppc-%{ppc_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ %endif %ifarch x86_64 -install -pm644 essential-amd64-%{x86_64_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ +install -p essential-amd64-%{x86_64_ver}/* $RPM_BUILD_ROOT%{_codecsdir}/ %endif rm -f $RPM_BUILD_ROOT%{_codecsdir}/README @@ -96,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT %{_codecsdir}/DECVW_32.DLL %{_codecsdir}/drvc.so %{_codecsdir}/dspr.so.6.0 +%{_codecsdir}/frapsvid.dll %{_codecsdir}/iac25_32.ax %{_codecsdir}/icmw_32.dll %{_codecsdir}/imc32.acm @@ -152,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT %{_codecsdir}/wmvdmod.dll %{_codecsdir}/wnvwinx.dll %{_codecsdir}/wvc1dmod.dll +%{_codecsdir}/xanlib.dll %endif %ifarch alpha %doc all-alpha-%{alpha_ver}/README @@ -174,7 +176,6 @@ rm -rf $RPM_BUILD_ROOT %endif %ifarch x86_64 %doc essential-amd64-%{x86_64_ver}/README -%{_codecsdir}/atrc.so %{_codecsdir}/cook.so %{_codecsdir}/drvc.so %{_codecsdir}/sipr.so @@ -183,16 +184,26 @@ rm -rf $RPM_BUILD_ROOT %files extra %ifarch i386 %defattr(0644,root,root,0755) -%{_codecsdir}/LCodcCMP.dll +%{_codecsdir}/ACDV.dll +%{_codecsdir}/ADV601.dll +%{_codecsdir}/aoxdxipl.ax %{_codecsdir}/aslcodec_vfw.dll %{_codecsdir}/asusasv2.dll %{_codecsdir}/asusasvd.dll %{_codecsdir}/ativcr2.dll %{_codecsdir}/avimszh.dll %{_codecsdir}/avizlib.dll +%{_codecsdir}/blox.dll +%{_codecsdir}/BTVVC32.DRV +%{_codecsdir}/bw10.dll +%{_codecsdir}/camfc.dll +%{_codecsdir}/cinedec.ax +%{_codecsdir}/cinevfw.dll +%{_codecsdir}/CineWave.qtx %{_codecsdir}/cook.so.6.0 %{_codecsdir}/ctadp32.acm %{_codecsdir}/ddnt.so.6.0 +%{_codecsdir}/decvdo.dll %{_codecsdir}/divx.dll %{_codecsdir}/divx_c32.ax %{_codecsdir}/divxa32.acm @@ -202,17 +213,26 @@ rm -rf $RPM_BUILD_ROOT %{_codecsdir}/drv2.so.6.0 %{_codecsdir}/drv3.so.6.0 %{_codecsdir}/drv4.so.6.0 +%{_codecsdir}/DVACM.acm +%{_codecsdir}/fmcodec.DLL +%{_codecsdir}/G2M.dll +%{_codecsdir}/GeoCodec.dll +%{_codecsdir}/GXAMP4.dll %{_codecsdir}/huffyuv.dll %{_codecsdir}/i263_32.drv %{_codecsdir}/iccvid.dll %{_codecsdir}/imaadp32.acm %{_codecsdir}/ir32_32.dll +%{_codecsdir}/kdvyuv8.dll +%{_codecsdir}/KGV1-VFW.dll +%{_codecsdir}/LCodcCMP.dll %{_codecsdir}/l3codeca.acm %{_codecsdir}/l3codecx.ax %{_codecsdir}/m3jpeg32.dll %{_codecsdir}/m3jpegdec.ax %{_codecsdir}/mcdvd_32.dll %{_codecsdir}/mcmjpg32.dll +%{_codecsdir}/MLZCodec.dll %{_codecsdir}/mpg4c32.dll %{_codecsdir}/mpg4ds32.ax %{_codecsdir}/msadp32.acm @@ -221,15 +241,36 @@ rm -rf $RPM_BUILD_ROOT %{_codecsdir}/msnaudio.acm %{_codecsdir}/msrle32.dll %{_codecsdir}/msvidc32.dll +%{_codecsdir}/MVCodec.dll +%{_codecsdir}/mvoice.vwp %{_codecsdir}/mvoiced.vwp +%{_codecsdir}/Nsgsm32.acm +%{_codecsdir}/Nstsp32.acm +%{_codecsdir}/nsvideo.dll +%{_codecsdir}/NuB2.dll +%{_codecsdir}/nuvision.ax %{_codecsdir}/pclepim1.dll %{_codecsdir}/qdv.dll %{_codecsdir}/scg726.acm +%{_codecsdir}/SCLS.DLL +%{_codecsdir}/scrvid.dll +%{_codecsdir}/Sif1Dec.ax +%{_codecsdir}/Sif1_vfw.dll +%{_codecsdir}/smcelp32.acm +%{_codecsdir}/SN4Codec.dll +%{_codecsdir}/sp4x_32.dll %{_codecsdir}/sp5x_32.dll +%{_codecsdir}/tm2Xdec.ax +%{_codecsdir}/tm2x.dll +%{_codecsdir}/TRICDC32.DRV %{_codecsdir}/tsccvid.dll %{_codecsdir}/ubv263d+.ax %{_codecsdir}/ubvmp4d.dll %{_codecsdir}/ultimo.dll +%{_codecsdir}/vdo32_30.drv +%{_codecsdir}/vdowave2.acm +%{_codecsdir}/vdowave.acm +%{_codecsdir}/VFCodec.dll %{_codecsdir}/vgpix32d.dll %{_codecsdir}/vid_cvid.xa %{_codecsdir}/vid_cyuv.xa @@ -238,11 +279,22 @@ rm -rf $RPM_BUILD_ROOT %{_codecsdir}/vid_iv32.xa %{_codecsdir}/vid_iv41.xa %{_codecsdir}/vid_iv50.xa +%{_codecsdir}/voxmvdec.ax %{_codecsdir}/vp31vfw.dll +%{_codecsdir}/WavCWAIP.dll +%{_codecsdir}/wavelet.dll +%{_codecsdir}/WAVLOR.DLL +%{_codecsdir}/WCMV.dll %{_codecsdir}/wmv8ds32.ax %{_codecsdir}/wmvds32.ax %{_codecsdir}/wnvplay1.dll +%{_codecsdir}/wtvc.DLL +%{_codecsdir}/wv32vfw.dll +%{_codecsdir}/xfcodec.dll +%{_codecsdir}/ylc.vcm +%{_codecsdir}/Zlib.dll %{_codecsdir}/zmbv.dll +%{_codecsdir}/ZyGoAudioS.qtx %endif %ifarch alpha ppc %{_codecsdir}/14_4.so.6.0 @@ -254,7 +306,13 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Sat Oct 06 2007 Dominik Mierzejewski <rpm at greysector.net> +* Fri Aug 20 2010 Dominik Mierzejewski <rpm(a)greysector.net> 20100303-1 +- updated i386 pack + +* Mon Feb 11 2008 Dominik Mierzejewski <rpm(a)greysector.net> 20071007-1 +- updated i386 pack + +* Sat Oct 06 2007 Dominik Mierzejewski <rpm(a)greysector.net> 20060622-1 - specfile cleanups - added backwards compatibility Provides: - dropped old history

1 0

r31985 - trunk/command.c
by reimar 20 Aug '10

20 Aug '10

Author: reimar Date: Fri Aug 20 17:48:09 2010 New Revision: 31985 Log: 100l, re-add vobsub_get_id_by_index call accidentally removed in r31678. Patch by ubitux [ubitux gmail com]. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Fri Aug 20 01:48:19 2010 (r31984) +++ trunk/command.c Fri Aug 20 17:48:09 2010 (r31985) @@ -1543,7 +1543,7 @@ static int mp_property_sub(m_option_t *p #endif if (source == SUB_SOURCE_VOBSUB) { - vobsub_id = source_pos; + vobsub_id = vobsub_get_id_by_index(vo_vobsub, source_pos); } else if (source == SUB_SOURCE_SUBS) { mpctx->set_of_sub_pos = source_pos; #ifdef CONFIG_ASS

1 0

r31983 - trunk/etc/codecs.conf
by compn 19 Aug '10

19 Aug '10

Author: compn Date: Fri Aug 20 00:13:25 2010 New Revision: 31983 Log: add binary codecs for fourcc: IMM4, LZOC, DIRC, MHFY, MSA1 map vvvc fourcc to ffh264 works on the single vvvc sample from uncommon codecs list Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Aug 19 16:36:16 2010 (r31982) +++ trunk/etc/codecs.conf Fri Aug 20 00:13:25 2010 (r31983) @@ -89,6 +89,38 @@ videocodec geov dll "GeoCodec.dll" out BGR24 flip +videocodec imm4 + info "infinity cctv codec" + status working + fourcc IMM4 + driver vfw + dll "VCMIMM4.dll" + out BGR15 flip + +videocodec lzocodec + info "lzo lossless" + status working + fourcc LZOC + driver vfw + dll "lzocodec.dll" + out YV12,YUY2 + +videocodec direccionalvfw + info "direccional lossless codec" + status working + fourcc DIRC + driver vfw + dll "direccional.dll" + out BGR24,BGR32 flip + +videocodec mhuffyuv + info "mhuffyuv lossless codec" + status working + fourcc MHFY + driver vfw + dll "mhuffyuv.dll" + out BGR24,BGR32 flip + videocodec zmbv info "Zip Motion-Block Video" status working @@ -936,6 +968,7 @@ videocodec ffh264 fourcc X264,x264 fourcc avc1,AVC1 fourcc davc,DAVC + fourcc vvvc ; only one sample using this fourcc format 0x10000005 driver ffmpeg dll h264 @@ -1265,6 +1298,15 @@ videocodec wms10dmod guid 0x7bafb3b1, 0xd8f4, 0x4279, 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde out BGR32,BGR24,BGR16 +videocodec msascreen + info "MS ATC screen decoder 1" + status working + fourcc MSA1 + driver dmo + dll "scdec.dll" + guid 0xf1931d8e, 0x51d3, 0x496f, 0xbe, 0x8a, 0x3d, 0x08, 0xae, 0xe9, 0xc9, 0xdb + out BGR24 + videocodec eescreen info "expression encoder" comment "requires xp or newer and msvcr100.dll"

1 0

r31858 - in branches/1.0rc4/libmpcodecs: vf_geq.c vf_qp.c
by siretart 19 Aug '10

19 Aug '10

Author: siretart Date: Thu Jul 29 13:36:59 2010 New Revision: 31858 Log: Revert commit r31322 by cehoyos Modified: branches/1.0rc4/libmpcodecs/vf_geq.c branches/1.0rc4/libmpcodecs/vf_qp.c Modified: branches/1.0rc4/libmpcodecs/vf_geq.c ============================================================================== --- branches/1.0rc4/libmpcodecs/vf_geq.c Thu Jul 29 11:15:32 2010 (r31857) +++ branches/1.0rc4/libmpcodecs/vf_geq.c Thu Jul 29 13:36:59 2010 (r31858) @@ -34,7 +34,7 @@ #include "vf.h" #include "libavcodec/avcodec.h" -#include "libavutil/eval.h" +#include "libavcodec/eval.h" struct vf_priv_s { AVExpr * e[3]; @@ -116,7 +116,7 @@ static int put_image(struct vf_instance const_values[3]=y; for(x=0; x<w; x++){ const_values[2]=x; - dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane], + dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane], const_values, vf); } } @@ -178,7 +178,7 @@ static int vf_open(vf_instance_t *vf, ch plane==0 ? lum : (plane==1 ? cb : cr), NULL }; - res = av_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); + res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); if (res < 0) { mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]); Modified: branches/1.0rc4/libmpcodecs/vf_qp.c ============================================================================== --- branches/1.0rc4/libmpcodecs/vf_qp.c Thu Jul 29 11:15:32 2010 (r31857) +++ branches/1.0rc4/libmpcodecs/vf_qp.c Thu Jul 29 13:36:59 2010 (r31858) @@ -32,7 +32,7 @@ #include "libvo/fastmemcpy.h" #include "libavcodec/avcodec.h" -#include "libavutil/eval.h" +#include "libavcodec/eval.h" struct vf_priv_s { @@ -69,7 +69,7 @@ static int config(struct vf_instance *vf double temp_val; int res; - res= av_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); + res= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); if (res < 0){ mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);

3 2

r31981 - trunk/configure
by diego 18 Aug '10

18 Aug '10

Author: diego Date: Thu Aug 19 01:20:23 2010 New Revision: 31981 Log: Fix documentation language variables in summary output after configure run. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Aug 19 01:10:10 2010 (r31980) +++ trunk/configure Thu Aug 19 01:20:23 2010 (r31981) @@ -9491,7 +9491,7 @@ EOF if test "$_mtrr" = yes ; then - echo "Please check mtrr settings at /proc/mtrr (see DOCS/HTML/$doc_lang/video.html#mtrr)" + echo "Please check mtrr settings at /proc/mtrr (see DOCS/HTML/$language_doc/video.html#mtrr)" echo fi @@ -9518,7 +9518,7 @@ If you used one of these options (except turn on internal features) and experience a compilation or linking failure, make sure you have passed the necessary compiler/linker flags to configure. -If you suspect a bug, please read DOCS/HTML/$doc_lang/bugreports.html. +If you suspect a bug, please read DOCS/HTML/$language_doc/bugreports.html. EOF

1 0

r31975 - trunk/configure
by siretart 18 Aug '10

18 Aug '10

Author: siretart Date: Wed Aug 18 21:28:22 2010 New Revision: 31975 Log: introduce new option --enable-system-ffmpeg to use shared ffmpeg libraries only Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Aug 18 19:23:21 2010 (r31974) +++ trunk/configure Wed Aug 18 21:28:22 2010 (r31975) @@ -355,6 +355,7 @@ Codecs: --disable-libavformat_so disable shared libavformat [autodetect] --disable-libpostproc_so disable shared libpostproc [autodetect] --disable-libswscale_so disable shared libswscale [autodetect] + --enable-system-ffmpeg use system ffmpeg libraries [no] --disable-libavcodec_mpegaudio_hp disable high precision audio decoding in libavcodec [enabled] --disable-tremor-internal disable internal Tremor [enabled] @@ -588,6 +589,7 @@ _libavutil_so=auto _libavcodec_a=auto _libavcore_a=auto _libavcore_so=auto +_system_ffmpeg=no _libopencore_amrnb=auto _libopencore_amrwb=auto libopenjpeg=auto @@ -1246,6 +1248,12 @@ for ac_option do --disable-libswscale_a) _libswscale_a=no ;; --enable-libswscale_so) _libswscale_so=yes ;; --disable-libswscale_so) _libswscale_so=no ;; + --enable-system-ffmpeg) _libavcore_a=no ; _libavcore_so=yes + _libavutil_a=no ; _libavutil_so=yes + _libavcodec_a=no ; _libavcodec_so=yes + _libswscale_a=no ; _libswscale_so=yes + _libavformat_a=no ; _libavformat_so=yes + _libpostproc_a=no ; _libpostproc_so=yes ;; --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;;

1 0

r31973 - in trunk: libmpdemux/demux_mpg.h libmpdemux/demux_ts.h libvo/sdl_common.h stream/stream_netstream.h subassconvert.h
by diego 18 Aug '10

18 Aug '10

Author: diego Date: Wed Aug 18 15:45:06 2010 New Revision: 31973 Log: Add #includes for headers necessary to pass 'make checkheaders'. Modified: trunk/libmpdemux/demux_mpg.h trunk/libmpdemux/demux_ts.h trunk/libvo/sdl_common.h trunk/stream/stream_netstream.h trunk/subassconvert.h Modified: trunk/libmpdemux/demux_mpg.h ============================================================================== --- trunk/libmpdemux/demux_mpg.h Wed Aug 18 00:39:24 2010 (r31972) +++ trunk/libmpdemux/demux_mpg.h Wed Aug 18 15:45:06 2010 (r31973) @@ -19,6 +19,8 @@ #ifndef MPLAYER_DEMUX_MPG_H #define MPLAYER_DEMUX_MPG_H +#include <sys/types.h> + extern off_t ps_probe; #endif /* MPLAYER_DEMUX_MPG_H */ Modified: trunk/libmpdemux/demux_ts.h ============================================================================== --- trunk/libmpdemux/demux_ts.h Wed Aug 18 00:39:24 2010 (r31972) +++ trunk/libmpdemux/demux_ts.h Wed Aug 18 15:45:06 2010 (r31973) @@ -19,6 +19,8 @@ #ifndef MPLAYER_DEMUX_TS_H #define MPLAYER_DEMUX_TS_H +#include <sys/types.h> + #define TS_MAX_PROBE_SIZE 2000000 extern off_t ts_probe; Modified: trunk/libvo/sdl_common.h ============================================================================== --- trunk/libvo/sdl_common.h Wed Aug 18 00:39:24 2010 (r31972) +++ trunk/libvo/sdl_common.h Wed Aug 18 15:45:06 2010 (r31973) @@ -22,6 +22,7 @@ #define MPLAYER_SDL_COMMON_H #include "config.h" +#include <stdint.h> #ifdef CONFIG_SDL_SDL_H #include <SDL/SDL.h> #else Modified: trunk/stream/stream_netstream.h ============================================================================== --- trunk/stream/stream_netstream.h Wed Aug 18 00:39:24 2010 (r31972) +++ trunk/stream/stream_netstream.h Wed Aug 18 15:45:06 2010 (r31973) @@ -33,8 +33,10 @@ #if !HAVE_WINSOCK2_H #include <sys/socket.h> #endif + #include "mp_msg.h" #include "mpbswap.h" +#include "network.h" typedef struct mp_net_stream_packet_st { uint16_t len; Modified: trunk/subassconvert.h ============================================================================== --- trunk/subassconvert.h Wed Aug 18 00:39:24 2010 (r31972) +++ trunk/subassconvert.h Wed Aug 18 15:45:06 2010 (r31973) @@ -21,6 +21,8 @@ #ifndef MPLAYER_SUBASSCONVERT_H #define MPLAYER_SUBASSCONVERT_H +#include <sys/types.h> + void subassconvert_subrip(const char *orig, char *dest, size_t dest_buffer_size); void subassconvert_microdvd(const char *orig, char *dest, size_t dest_buffer_size);

1 0

r31972 - trunk/libao2/ao_coreaudio.c
by diego 17 Aug '10

17 Aug '10

Author: diego Date: Wed Aug 18 00:39:24 2010 New Revision: 31972 Log: Fix a bunch of grammar and spelling errors in mp_msg calls. Modified: trunk/libao2/ao_coreaudio.c Modified: trunk/libao2/ao_coreaudio.c ============================================================================== --- trunk/libao2/ao_coreaudio.c Tue Aug 17 18:45:17 2010 (r31971) +++ trunk/libao2/ao_coreaudio.c Wed Aug 18 00:39:24 2010 (r31972) @@ -464,7 +464,9 @@ int device_id, display_help = 0; { ao->b_supports_digital = 1; } - ao_msg(MSGT_AO,MSGL_V, "probe default audio output device whether support digital s/pdif output:%d\n", ao->b_supports_digital ); + ao_msg(MSGT_AO, MSGL_V, + "probe default audio output device about support for digital s/pdif output: %d\n", + ao->b_supports_digital ); } free(psz_name); @@ -687,7 +689,8 @@ static int OpenSPDIF(void) (void **)&p_format_list); if (!i_param_size) { - ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streamformats.\n"); + ao_msg(MSGT_AO, MSGL_WARN, + "Could not get number of stream formats.\n"); continue; } @@ -722,7 +725,9 @@ static int OpenSPDIF(void) sizeof(ao->sfmt_revert), &ao->sfmt_revert); if (err != noErr) { - ao_msg(MSGT_AO, MSGL_WARN, "could not retrieve the original streamformat: [%4.4s]\n", (char *)&err); + ao_msg(MSGT_AO, MSGL_WARN, + "Could not retrieve the original stream format: [%4.4s]\n", + (char *)&err); if (p_format_list) free(p_format_list); continue; } @@ -756,7 +761,8 @@ static int OpenSPDIF(void) if (ao->i_stream_index < 0) { - ao_msg(MSGT_AO, MSGL_WARN, "can not find any digital output stream format when OpenSPDIF().\n"); + ao_msg(MSGT_AO, MSGL_WARN, + "Cannot find any digital output stream format when OpenSPDIF().\n"); goto err_out; } @@ -784,7 +790,8 @@ static int OpenSPDIF(void) #else if (ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian) #endif - ao_msg(MSGT_AO, MSGL_WARN, "output stream has a no-native byte-order, digital output may failed.\n"); + ao_msg(MSGT_AO, MSGL_WARN, + "Output stream has non-native byte order, digital output may fail.\n"); /* For ac3/dts, just use packet size 6144 bytes as chunk size. */ ao->chunk_size = ao->stream_format.mBytesPerPacket; @@ -896,7 +903,7 @@ static int AudioStreamSupportsDigital( A (void **)&p_format_list); if (!i_param_size) { - ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streamformats.\n"); + ao_msg(MSGT_AO, MSGL_WARN, "Could not get number of stream formats.\n"); return CONTROL_FALSE; } @@ -1033,21 +1040,22 @@ static int play(void* output_samples,int b_digital = AudioStreamSupportsDigital(ao->i_stream_id); if (b_digital) { - /* Current stream support digital format output, let's set it. */ - ao_msg(MSGT_AO, MSGL_V, "detected current stream support digital, try to restore digital output...\n"); + /* Current stream supports digital format output, let's set it. */ + ao_msg(MSGT_AO, MSGL_V, + "Detected current stream supports digital, try to restore digital output...\n"); if (!AudioStreamChangeFormat(ao->i_stream_id, ao->stream_format)) { - ao_msg(MSGT_AO, MSGL_WARN, "restore digital output failed.\n"); + ao_msg(MSGT_AO, MSGL_WARN, "Restoring digital output failed.\n"); } else { - ao_msg(MSGT_AO, MSGL_WARN, "restore digital output succeed.\n"); + ao_msg(MSGT_AO, MSGL_WARN, "Restoring digital output succeeded.\n"); reset(); } } else - ao_msg(MSGT_AO, MSGL_V, "detected current stream do not support digital.\n"); + ao_msg(MSGT_AO, MSGL_V, "Detected current stream does not support digital.\n"); } wrote=write_buffer(output_samples, num_bytes);

1 0

r31959 - trunk/spudec.c
by diego 17 Aug '10

17 Aug '10

Author: diego Date: Fri Aug 13 13:08:30 2010 New Revision: 31959 Log: Mark constant sws_spu_image() parameter as const, fixes the warning: spudec.c:874: warning: passing argument 2 of 'sws_scale' from incompatible pointer type Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Wed Aug 11 22:59:03 2010 (r31958) +++ trunk/spudec.c Fri Aug 13 13:08:30 2010 (r31959) @@ -852,8 +852,8 @@ static void scale_image(int x, int y, sc } static void sws_spu_image(unsigned char *d1, unsigned char *d2, int dw, int dh, - int ds, unsigned char *s1, unsigned char *s2, int sw, - int sh, int ss) + int ds, const unsigned char* s1, unsigned char* s2, + int sw, int sh, int ss) { struct SwsContext *ctx; static SwsFilter filter;

3 2

r31969 - trunk/Makefile
by diego 17 Aug '10

17 Aug '10

Author: diego Date: Tue Aug 17 17:12:35 2010 New Revision: 31969 Log: Remove hack that skips including dependency files on distclean. Now that dependency files are generated as a sideeffect of compilation this workaround is no longer needed since distclean no longer tries to create them. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Aug 17 17:07:16 2010 (r31968) +++ trunk/Makefile Tue Aug 17 17:12:35 2010 (r31969) @@ -1154,10 +1154,7 @@ dhahelperwinclean: -# Do not include dependencies when they are about to be removed anyway. -ifneq ($(MAKECMDGOALS),distclean) -include $(DEPS) -endif .PHONY: all doxygen *install* *tools drivers dhahelper* .PHONY: checkheaders *clean tests

1 0