January 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r32777 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp...
by cboesch 18 Jun '11

18 Jun '11

Author: cboesch Date: Mon Jan 10 20:18:51 2011 New Revision: 32777 Log: Add size based support for -endpos in MPlayer. Modified: trunk/mplayer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/mplayer.c Mon Jan 10 20:18:51 2011 (r32777) @@ -3654,11 +3654,6 @@ if (seek_to_sec) { end_at.pos += seek_to_sec; } -if (end_at.type == END_AT_SIZE) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased); - end_at.type = END_AT_NONE; -} - #ifdef CONFIG_DVDNAV mp_dvdnav_context_free(mpctx); if (mpctx->stream->type == STREAMTYPE_DVDNAV) { @@ -3702,7 +3697,8 @@ if(!mpctx->sh_video) { if(!quiet) print_status(a_pos, 0, 0); - if(end_at.type == END_AT_TIME && end_at.pos < a_pos) + if(end_at.type == END_AT_TIME && end_at.pos < a_pos || + end_at.type == END_AT_SIZE && end_at.pos < stream_tell(mpctx->stream)) mpctx->eof = PT_NEXT_ENTRY; update_subtitles(NULL, a_pos, mpctx->d_sub, 0); update_osd_msg(); @@ -3810,10 +3806,9 @@ if(auto_quality>0){ if (play_n_frames <= 0) mpctx->eof = PT_NEXT_ENTRY; } - -// FIXME: add size based support for -endpos - if (end_at.type == END_AT_TIME && - !frame_time_remaining && end_at.pos <= mpctx->sh_video->pts) + if (!frame_time_remaining && + ((end_at.type == END_AT_TIME && mpctx->sh_video->pts >= end_at.pos) || + (end_at.type == END_AT_SIZE && stream_tell(mpctx->stream) >= end_at.pos))) mpctx->eof = PT_NEXT_ENTRY; } // end if(mpctx->sh_video)

4 9

r32830 - in trunk: . configure
by reimar 03 Feb '11

03 Feb '11

Author: reimar Date: Sun Jan 30 11:27:31 2011 New Revision: 32830 Log: Remove outdated FFmpeg svn external, make configure optionally get and update a git checkout. Modified: trunk/ (props changed) trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jan 29 17:43:54 2011 (r32829) +++ trunk/configure Sun Jan 30 11:27:31 2011 (r32830) @@ -35,6 +35,29 @@ # ############################################################################# +if test -e ffmpeg/.svn ; then + echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" + exit 1 +fi + +if test -e ffmpeg/mp_auto_pull ; then + if ! (cd ffmpeg && git pull --rebase --ff-only) ; then + echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + exit 1 + fi +fi + +if ! test -e ffmpeg ; then + echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" + read tmp + if ! git clone git://git.videolan.org/ffmpeg.git ffmpeg ; then + rm -rf ffmpeg + echo "Failed to get a FFmpeg checkout" + exit 1 + fi + touch ffmpeg/mp_auto_pull +fi + # Prevent locale nonsense from breaking basic text processing utils export LC_ALL=C

5 4

r32834 - in trunk/libmpcodecs: vf_perspective.c vf_pp7.c vf_sab.c
by michael 31 Jan '11

31 Jan '11

Author: michael Date: Sun Jan 30 23:57:16 2011 New Revision: 32834 Log: Replace memalign() by av_malloc() in libmpcodecs. as it is not available in all platforms ported from ffmpeg Modified: trunk/libmpcodecs/vf_perspective.c trunk/libmpcodecs/vf_pp7.c trunk/libmpcodecs/vf_sab.c Modified: trunk/libmpcodecs/vf_perspective.c ============================================================================== --- trunk/libmpcodecs/vf_perspective.c Sun Jan 30 11:40:08 2011 (r32833) +++ trunk/libmpcodecs/vf_perspective.c Sun Jan 30 23:57:16 2011 (r32834) @@ -108,7 +108,7 @@ static int config(struct vf_instance *vf int i, j; vf->priv->pvStride= width; - vf->priv->pv= (void*)memalign(8, width*height*2*sizeof(int32_t)); + vf->priv->pv= av_malloc(width*height*2*sizeof(int32_t)); initPv(vf->priv, width, height); for(i=0; i<SUB_PIXELS; i++){ @@ -132,7 +132,7 @@ static int config(struct vf_instance *vf static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - free(vf->priv->pv); + av_free(vf->priv->pv); vf->priv->pv= NULL; free(vf->priv); Modified: trunk/libmpcodecs/vf_pp7.c ============================================================================== --- trunk/libmpcodecs/vf_pp7.c Sun Jan 30 11:40:08 2011 (r32833) +++ trunk/libmpcodecs/vf_pp7.c Sun Jan 30 23:57:16 2011 (r32834) @@ -350,7 +350,7 @@ static int config(struct vf_instance *vf int h= (height+16+15)&(~15); vf->priv->temp_stride= (width+16+15)&(~15); - vf->priv->src = memalign(8, vf->priv->temp_stride*(h+8)*sizeof(uint8_t)); + vf->priv->src = av_malloc(vf->priv->temp_stride*(h+8)*sizeof(uint8_t)); return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } @@ -410,7 +410,7 @@ static int put_image(struct vf_instance static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - free(vf->priv->src); + av_free(vf->priv->src); vf->priv->src= NULL; free(vf->priv); Modified: trunk/libmpcodecs/vf_sab.c ============================================================================== --- trunk/libmpcodecs/vf_sab.c Sun Jan 30 11:40:08 2011 (r32833) +++ trunk/libmpcodecs/vf_sab.c Sun Jan 30 23:57:16 2011 (r32834) @@ -95,7 +95,7 @@ static int allocStuff(FilterParam *f, in SwsVector *vec; SwsFilter swsF; int i,x,y; - f->preFilterBuf= (uint8_t*)memalign(8, stride*height); + f->preFilterBuf= av_malloc(stride*height); f->preFilterStride= stride; vec = sws_getGaussianVec(f->preFilterRadius, f->quality); @@ -119,7 +119,7 @@ static int allocStuff(FilterParam *f, in vec = sws_getGaussianVec(f->radius, f->quality); f->distWidth= vec->length; f->distStride= (vec->length+7)&~7; - f->distCoeff= (int32_t*)memalign(8, f->distWidth*f->distStride*sizeof(int32_t)); + f->distCoeff= av_malloc(f->distWidth*f->distStride*sizeof(int32_t)); for(y=0; y<vec->length; y++){ for(x=0; x<vec->length; x++){ @@ -153,10 +153,10 @@ static void freeBuffers(FilterParam *f){ if(f->preFilterContext) sws_freeContext(f->preFilterContext); f->preFilterContext=NULL; - free(f->preFilterBuf); + av_free(f->preFilterBuf); f->preFilterBuf=NULL; - free(f->distCoeff); + av_free(f->distCoeff); f->distCoeff=NULL; }

4 4

r32837 - in trunk: TOOLS/aconvert.sh TOOLS/binary_codecs.sh TOOLS/divx2svcd.sh TOOLS/mencvcd.sh TOOLS/midentify.sh TOOLS/mpconsole.sh libaf/af_resample_template.c libmpeg2/libmpeg2_changes.diff lib...
by cboesch 31 Jan '11

31 Jan '11

Author: cboesch Date: Mon Jan 31 16:45:46 2011 New Revision: 32837 Log: Revert 32836: Uoti Urpala did not approved the relicensing. vo_vdpau contains some of his code (see at least r29777). Modified: trunk/TOOLS/aconvert.sh (props changed) trunk/TOOLS/binary_codecs.sh (props changed) trunk/TOOLS/divx2svcd.sh (props changed) trunk/TOOLS/mencvcd.sh (props changed) trunk/TOOLS/midentify.sh (props changed) trunk/TOOLS/mpconsole.sh (props changed) trunk/libaf/af_resample_template.c (props changed) trunk/libmpeg2/libmpeg2_changes.diff (props changed) trunk/libvo/vo_vdpau.c trunk/stream/stream_live555.c (props changed) trunk/stream/stream_netstream.h (props changed) Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Jan 31 11:06:29 2011 (r32836) +++ trunk/libvo/vo_vdpau.c Mon Jan 31 16:45:46 2011 (r32837) @@ -18,11 +18,6 @@ * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * You can alternatively redistribute this file and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. */ /**

3 2

[propchange]: r32837 - svn:log
by cboesch 31 Jan '11

31 Jan '11

Author: cboesch Revision: 32837 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,3 @@ -Revert 32836: Uoti Urpala did not approved the relicensing. +Revert 32836: Uoti Urpala did not approve the relicensing. vo_vdpau contains some of his code (see at least r29777). -

1 0

r32836 - trunk/libvo/vo_vdpau.c
by cehoyos 31 Jan '11

31 Jan '11

Author: cehoyos Date: Mon Jan 31 11:06:29 2011 New Revision: 32836 Log: Allow LGPL re-distribution of vo_vdpau.c. Agreed upon by Stephen Warren for Nvidia, Grigori Goronzy, Reimar and Ivan Kalvachev (as the developer of vo_xvmc.c which may have been the original source of the file). Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Jan 31 10:55:19 2011 (r32835) +++ trunk/libvo/vo_vdpau.c Mon Jan 31 11:06:29 2011 (r32836) @@ -18,6 +18,11 @@ * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * You can alternatively redistribute this file and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. */ /**

4 4

r32835 - in trunk/libmpcodecs: vf_perspective.c vf_pp7.c
by cehoyos 31 Jan '11

31 Jan '11

Author: cehoyos Date: Mon Jan 31 10:55:19 2011 New Revision: 32835 Log: Fix postprocessing and perspective filters on x86-64. Original patch by Reinhard Tartler Modified: trunk/libmpcodecs/vf_perspective.c trunk/libmpcodecs/vf_pp7.c Modified: trunk/libmpcodecs/vf_perspective.c ============================================================================== --- trunk/libmpcodecs/vf_perspective.c Sun Jan 30 23:57:16 2011 (r32834) +++ trunk/libmpcodecs/vf_perspective.c Mon Jan 31 10:55:19 2011 (r32835) @@ -32,6 +32,8 @@ #include <malloc.h> #endif +#include "libavutil/mem.h" + #include "img_format.h" #include "mp_image.h" #include "vf.h" Modified: trunk/libmpcodecs/vf_pp7.c ============================================================================== --- trunk/libmpcodecs/vf_pp7.c Sun Jan 30 23:57:16 2011 (r32834) +++ trunk/libmpcodecs/vf_pp7.c Mon Jan 31 10:55:19 2011 (r32835) @@ -34,6 +34,8 @@ #include <malloc.h> #endif +#include "libavutil/mem.h" + #include "img_format.h" #include "mp_image.h" #include "vf.h"

1 0

r32833 - trunk/stream/url.c
by reimar 30 Jan '11

30 Jan '11

Author: reimar Date: Sun Jan 30 11:40:08 2011 New Revision: 32833 Log: Escape character values >= 127 in URLs as required by the RFC. Modified: trunk/stream/url.c Modified: trunk/stream/url.c ============================================================================== --- trunk/stream/url.c Sun Jan 30 11:38:10 2011 (r32832) +++ trunk/stream/url.c Sun Jan 30 11:40:08 2011 (r32833) @@ -327,8 +327,7 @@ url_escape_string_part(char *outbuf, con if( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || - (c >= '0' && c <= '9') || - (c >= 0x7f)) { + (c >= '0' && c <= '9')) { *outbuf++ = c; } else if ( c=='%' && ((c1 >= '0' && c1 <= '9') || (c1 >= 'A' && c1 <= 'F')) && ((c2 >= '0' && c2 <= '9') || (c2 >= 'A' && c2 <= 'F'))) {

1 0

r32832 - trunk/libmpdemux/demux_asf.c
by reimar 30 Jan '11

30 Jan '11

Author: reimar Date: Sun Jan 30 11:38:10 2011 New Revision: 32832 Log: Check that rlen is valid before using it to increment a pointer. Modified: trunk/libmpdemux/demux_asf.c Modified: trunk/libmpdemux/demux_asf.c ============================================================================== --- trunk/libmpdemux/demux_asf.c Sun Jan 30 11:35:00 2011 (r32831) +++ trunk/libmpdemux/demux_asf.c Sun Jan 30 11:38:10 2011 (r32832) @@ -469,6 +469,10 @@ static int demux_asf_fill_buffer(demuxer rlen = read_varlen(&p, segtype, 0); // printf("### rlen=%d \n",rlen); + if (rlen < 0 || rlen > p_end - p) { + mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%d\n", rlen); + break; + } switch(rlen){ case 0x01: // 1 = special, means grouping

1 0

r32831 - trunk/libmpdemux/demuxer.h
by reimar 30 Jan '11

30 Jan '11

Author: reimar Date: Sun Jan 30 11:35:00 2011 New Revision: 32831 Log: Make new_demux_packet return NULL if allocation failed, this should ease checking for failure in code and where those checks are missing it should ensure crashes instead of possibly exploitable code. Modified: trunk/libmpdemux/demuxer.h Modified: trunk/libmpdemux/demuxer.h ============================================================================== --- trunk/libmpdemux/demuxer.h Sun Jan 30 11:27:31 2011 (r32830) +++ trunk/libmpdemux/demuxer.h Sun Jan 30 11:35:00 2011 (r32831) @@ -294,8 +294,11 @@ static inline demux_packet_t* new_demux_ dp->buffer=NULL; if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + MP_INPUT_BUFFER_PADDING_SIZE))) memset(dp->buffer + len, 0, MP_INPUT_BUFFER_PADDING_SIZE); - else - dp->len = 0; + else if (len) { + // do not even return a valid packet if allocation failed + free(dp); + return NULL; + } return dp; }

1 0