June 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r29340 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Tue Jun 2 00:25:10 2009 New Revision: 29340 Log: Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctly again instead of in CorePNG delta mode. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Mon Jun 1 12:43:41 2009 (r29339) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue Jun 2 00:25:10 2009 (r29340) @@ -758,6 +758,7 @@ static mp_image_t *decode(sh_video_t *sh AVCodecContext *avctx = ctx->avctx; mp_image_t *mpi=NULL; int dr1= ctx->do_dr1; + AVPacket pkt; if(len<=0) return NULL; // skipped frame @@ -778,8 +779,12 @@ static mp_image_t *decode(sh_video_t *sh mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n", ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]); - ret = avcodec_decode_video(avctx, pic, - &got_picture, data, len); + av_init_packet(&pkt); + pkt.data = data; + pkt.size = len; + // HACK: make PNGs decode normally instead of as CorePNG delta frames + pkt.flags = PKT_FLAG_KEY; + ret = avcodec_decode_video2(avctx, pic, &got_picture, &pkt); dr1= ctx->do_dr1; if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n");

1 0

r29339 - trunk/libmpcodecs/ad_imaadpcm.c
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Mon Jun 1 12:43:41 2009 New Revision: 29339 Log: Initialize local variable, avoids a possible crash due to using an uninitialized variable as array index for mono files. Modified: trunk/libmpcodecs/ad_imaadpcm.c Modified: trunk/libmpcodecs/ad_imaadpcm.c ============================================================================== --- trunk/libmpcodecs/ad_imaadpcm.c Mon Jun 1 11:43:32 2009 (r29338) +++ trunk/libmpcodecs/ad_imaadpcm.c Mon Jun 1 12:43:41 2009 (r29339) @@ -163,8 +163,8 @@ static void decode_nibbles(unsigned shor static int qt_ima_adpcm_decode_block(unsigned short *output, unsigned char *input, int channels, int block_size) { - int initial_predictor[2]; - int initial_index[2]; + int initial_predictor[2] = {0}; + int initial_index[2] = {0}; int i; if (channels != 1) channels = 2;

1 0

r29338 - trunk/libmpdemux/demux_lavf.c
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Mon Jun 1 11:43:32 2009 New Revision: 29338 Log: Add const where appropriate, also gets rid of a compiler warning. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Mon Jun 1 11:39:02 2009 (r29337) +++ trunk/libmpdemux/demux_lavf.c Mon Jun 1 11:43:32 2009 (r29338) @@ -171,7 +171,7 @@ static int lavf_check_file(demuxer_t *de return DEMUXER_TYPE_LAVF; } -static const char *preferred_list[] = { +static const char * const preferred_list[] = { "dxa", "wv", "nuv", @@ -188,7 +188,7 @@ static const char *preferred_list[] = { static int lavf_check_preferred_file(demuxer_t *demuxer){ if (lavf_check_file(demuxer)) { - char **p = preferred_list; + const char * const *p = preferred_list; lavf_priv_t *priv = demuxer->priv; while (*p) { if (strcmp(*p, priv->avif->name) == 0)

1 0

r29337 - trunk/libmpdemux/demux_lavf.c
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Mon Jun 1 11:39:02 2009 New Revision: 29337 Log: 100l, do not read probe buffer if it will not be used because a format was forced. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Mon Jun 1 11:35:16 2009 (r29336) +++ trunk/libmpdemux/demux_lavf.c Mon Jun 1 11:39:02 2009 (r29337) @@ -141,12 +141,6 @@ static int lavf_check_file(demuxer_t *de av_register_all(); - if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) - return 0; - avpd.filename= demuxer->stream->url; - avpd.buf= buf; - avpd.buf_size= PROBE_BUF_SIZE; - if (opt_format) { if (strcmp(opt_format, "help") == 0) { list_formats(); @@ -160,6 +154,13 @@ static int lavf_check_file(demuxer_t *de mp_msg(MSGT_DEMUX,MSGL_INFO,"Forced lavf %s demuxer\n", priv->avif->long_name); return DEMUXER_TYPE_LAVF; } + + if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) + return 0; + avpd.filename= demuxer->stream->url; + avpd.buf= buf; + avpd.buf_size= PROBE_BUF_SIZE; + priv->avif= av_probe_input_format(&avpd, 1); if(!priv->avif){ mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n");

1 0

r29336 - trunk/configure
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Mon Jun 1 11:35:16 2009 New Revision: 29336 Log: Add actually working support for PPC64 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 1 11:25:20 2009 (r29335) +++ trunk/configure Mon Jun 1 11:35:16 2009 (r29336) @@ -1381,7 +1381,8 @@ if test -z "$_target" ; then host_arch=i386 fi ;; - macppc|ppc|ppc64) host_arch=ppc ;; + macppc|ppc) host_arch=ppc ;; + ppc64) host_arch=ppc64 ;; alpha) host_arch=alpha ;; sparc) host_arch=sparc ;; sparc64) host_arch=sparc64 ;; @@ -2085,14 +2086,14 @@ EOF ppc|ppc64|powerpc|powerpc64) _arch='PPC' def_dcbzl='#define HAVE_DCBZL 0' - def_ppc64='#define HAVE_PPC64 0' _target_arch='ARCH_PPC = yes' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then + _arch='PPC PPC64' + _target_subarch='ARCH_PPC64 = yes' def_fast_64bit='#define HAVE_FAST_64BIT 1' - def_ppc64='#define HAVE_PPC64 1' fi echocheck "CPU type" case $system_name in @@ -8818,7 +8819,6 @@ $def_memalign_hack $def_mlib $def_mkstemp $def_posix_memalign -$def_ppc64 $def_pthreads $def_ten_operands $def_threads

1 0

r29335 - trunk/configure
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Mon Jun 1 11:25:20 2009 New Revision: 29335 Log: Use target_arch and target_subarch which is more similar to what FFmpeg uses and makes more sense when adding proper PPC64 or MIPS64 support. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 1 11:20:22 2009 (r29334) +++ trunk/configure Mon Jun 1 11:25:20 2009 (r29335) @@ -1714,8 +1714,8 @@ _arch_all='X86 X86_32 X86_64 IA64 SPARC case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32' - _target_arch_x86="ARCH_X86 = yes" - _target_arch="ARCH_X86_32 = yes" + _target_arch="ARCH_X86 = yes" + _target_subarch="ARCH_X86_32 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc=486 proc=i486 @@ -1954,8 +1954,8 @@ EOF x86_64|amd64) _arch='X86 X86_64' - _target_arch='ARCH_X86_64 = yes' - _target_arch_x86="ARCH_X86 = yes" + _target_subarch='ARCH_X86_64 = yes' + _target_arch="ARCH_X86 = yes" def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='x86_64' @@ -8164,7 +8164,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe $_target_arch -$_target_arch_x86 +$_target_subarch $(echo $_cpuexts | tr '[a-z] ' '[A-Z]\n' | sed 's/^/HAVE_/;s/$/=yes/') MENCODER = $_mencoder

1 0

r29334 - trunk/configure
by reimar 01 Jun '09

01 Jun '09

Author: reimar Date: Mon Jun 1 11:20:22 2009 New Revision: 29334 Log: Add some missing FFmpeg archs Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun May 31 15:09:48 2009 (r29333) +++ trunk/configure Mon Jun 1 11:20:22 2009 (r29334) @@ -1710,7 +1710,7 @@ fi def_fast_64bit='#define HAVE_FAST_64BIT 0' def_fast_unaligned='#define HAVE_FAST_UNALIGNED 0' -_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' +_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM AVR32 SH4 PPC PPC64 ALPHA MIPS SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32'

1 0