July 2016 - MPlayer-cvslog - lists.mplayerhq.hu

r37881 - trunk/configure
by al 25 Jul '16

25 Jul '16

Author: al Date: Tue Jul 26 00:31:21 2016 New Revision: 37881 Log: configure: HAVE_LOCALTIME_R, HAVE_GMTIME_R: Use #define ... 0 Those are used by FFmpeg and expected to always be defined (0 or 1). The #undef was an oversight of commit r37313 . Patch by Stephen Sheldon (sfsheldo gmail) Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jul 22 00:54:11 2016 (r37880) +++ trunk/configure Tue Jul 26 00:31:21 2016 (r37881) @@ -3490,7 +3490,7 @@ statement_check time.h 'gmtime_r(0, 0)' if test "$_gmtime_r" = yes ; then def_gmtime_r='#define HAVE_GMTIME_R 1' else - def_gmtime_r='#undef HAVE_GMTIME_R' + def_gmtime_r='#define HAVE_GMTIME_R 0' fi echores "$_gmtime_r" @@ -3500,7 +3500,7 @@ statement_check time.h 'localtime_r(0, 0 if test "$_localtime_r" = yes ; then def_localtime_r='#define HAVE_LOCALTIME_R 1' else - def_localtime_r='#undef HAVE_LOCALTIME_R' + def_localtime_r='#define HAVE_LOCALTIME_R 0' fi echores "$_localtime_r"

1 0

r37880 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 21 Jul '16

21 Jul '16

Author: reimar Date: Thu Jul 21 23:54:11 2016 New Revision: 37880 Log: vd_ffmpeg: check for malloc failure. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Thu Jul 21 23:50:00 2016 (r37879) +++ trunk/libmpcodecs/vd_ffmpeg.c Thu Jul 21 23:54:11 2016 (r37880) @@ -476,6 +476,10 @@ static int init(sh_video_t *sh){ break; avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!avctx->extradata) { + avctx->extradata_size = 0; + break; + } memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); break; }

1 0

r37879 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 21 Jul '16

21 Jul '16

Author: reimar Date: Thu Jul 21 23:50:00 2016 New Revision: 37879 Log: vd_ffmpeg: Fix accidental comparison as unsigned. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Thu Jul 21 23:46:42 2016 (r37878) +++ trunk/libmpcodecs/vd_ffmpeg.c Thu Jul 21 23:50:00 2016 (r37879) @@ -472,7 +472,7 @@ static int init(sh_video_t *sh){ break; default: - if (!sh->bih || sh->bih->biSize <= sizeof(*sh->bih)) + if (!sh->bih || sh->bih->biSize <= (int)sizeof(*sh->bih)) break; avctx->extradata_size = sh->bih->biSize-sizeof(*sh->bih); avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);

1 0

r37878 - trunk/libmpdemux/demux_gif.c
by reimar 21 Jul '16

21 Jul '16

Author: reimar Date: Thu Jul 21 23:46:42 2016 New Revision: 37878 Log: demux_gif: use calloc, set biSize correctly. Should fix trac issue 2301. Modified: trunk/libmpdemux/demux_gif.c Modified: trunk/libmpdemux/demux_gif.c ============================================================================== --- trunk/libmpdemux/demux_gif.c Fri Jul 8 10:23:56 2016 (r37877) +++ trunk/libmpdemux/demux_gif.c Thu Jul 21 23:46:42 2016 (r37878) @@ -277,8 +277,9 @@ static int demux_gif_fill_buffer(demuxer static demuxer_t* demux_open_gif(demuxer_t* demuxer) { - gif_priv_t *priv = calloc(1, sizeof(gif_priv_t)); + gif_priv_t *priv = calloc(1, sizeof(*priv)); sh_video_t *sh_video = NULL; + int bih_size = sizeof(*sh_video->bih) + (256 * 4); GifFileType *gif = NULL; priv->current_pts = 0; @@ -328,7 +329,8 @@ static demuxer_t* demux_open_gif(demuxer sh_video->fps = 5.0f; sh_video->frametime = 1.0f / sh_video->fps; - sh_video->bih = malloc(sizeof(*sh_video->bih) + (256 * 4)); + sh_video->bih = calloc(1, bih_size); + sh_video->bih->biSize = bih_size; sh_video->bih->biCompression = sh_video->format; sh_video->bih->biWidth = priv->w = (uint16_t)gif->SWidth; sh_video->bih->biHeight = priv->h = (uint16_t)gif->SHeight;

1 0

r37801 - trunk/etc/codecs.conf
by reimar 21 Jul '16

21 Jul '16

Author: reimar Date: Thu Feb 25 22:34:45 2016 New Revision: 37801 Log: codecs.conf: Prefer FFmpeg raw decoder for paletted. It is more likely to give the correct results, it seems even when combined with our native e.g. AVI demuxer, and it has more feature like supporting paletted 1-bit formats. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Feb 25 22:34:43 2016 (r37800) +++ trunk/etc/codecs.conf Thu Feb 25 22:34:45 2016 (r37801) @@ -4258,6 +4258,20 @@ videocodec rawbgr15 format 0x4247520F out BGR15 +videocodec ffrawpal + info "RAW PAL8" + comment "For decoding paletted 1, 2, 4 and 8 bit formats" + status working + driver ffmpeg + dll rawvideo + format 0x0 + format 0x20776172 0x42475208 + format 0x42475208 + format 0x42475204 + format 0x42475202 + format 0x42475201 + out BGR8,BGR1,RGB1 + videocodec rawbgr8 info "RAW BGR8" status working @@ -4276,18 +4290,6 @@ videocodec rawbgr1 format 0x42475201 out BGR1 -videocodec ffrawpal - info "RAW PAL8" - comment "For decoding paletted 2 and 4 bit formats" - status working - driver ffmpeg - dll rawvideo - format 0x0 - format 0x20776172 0x42475204 - format 0x42475204 - format 0x42475202 - out BGR8 - videocodec rawyuy2 info "RAW YUY2" status working

2 1

r37877 - trunk/configure
by ib 08 Jul '16

08 Jul '16

Author: ib Date: Fri Jul 8 10:23:56 2016 New Revision: 37877 Log: Explain normally pointless extra check for GLib. GLib is a requirement for GTK+ and will be checked automatically, but because of the use of g_filename_display_name() we need a specific minimum version other than the GLib version required for GTK+ anyway. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Jul 7 03:25:08 2016 (r37876) +++ trunk/configure Fri Jul 8 10:23:56 2016 (r37877) @@ -7944,7 +7944,7 @@ EOF fi echores "$_xshape" - # Check for GTK2 + # Check for GTK+ 2 echocheck "GTK+ version" if $_pkg_config --exists gtk+-2.0 ; then @@ -7959,7 +7959,9 @@ EOF die "$_gtk" fi - # Check for GLIB2 + # Check for specific minimum version of GLib + # (version 2.4.0, required by GTK+ 2.4.0, would have been + # checked automatically, but doesn't meet our requirements) echocheck "GLib version" if $_pkg_config --exists glib-2.0 ; then _glib=$($_pkg_config --modversion "glib-2.0 >= 2.6.0" 2>&1)

1 0

r37876 - trunk/etc/codecs.conf
by compn 07 Jul '16

07 Jul '16

Author: compn Date: Thu Jul 7 03:25:08 2016 New Revision: 37876 Log: codecs.conf add 3rvc binary codec and JR24 ffmjpeg and binary codec Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Jul 3 22:06:11 2016 (r37875) +++ trunk/etc/codecs.conf Thu Jul 7 03:25:08 2016 (r37876) @@ -1999,7 +1999,7 @@ videocodec ffmjpeg fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec fourcc CJPG ; Creative MJPG - fourcc MSC2 + fourcc MSC2,JR24 fourcc avi1,avi2 fourcc MTSJ,ZJPG,MJPx,FLJP fourcc FMJP,SJPG @@ -3444,6 +3444,24 @@ videocodec smsvvfw dll "wv32vfw.dll" out BGR24 flip +videocodec bluvismpeg4 + info "dvrcodec" + status working + comment "requires forged*.sys files from installer" + fourcc 3RVC + driver vfw + dll "MPEG4V.DLL" + out BGR24 flip + +videocodec qwtjr24 + info "Quadrox Jr24" + status working + fourcc JR24 + driver dmo + dll "OPJPEGDecmprDMO.dll" + guid 0x9004F687, 0xFEFC, 0x4F8F, 0xB2, 0x3A, 0xDD, 0xD3, 0x74, 0x80, 0x82, 0xE7 + out BGR24 flip + videocodec adv601 info "Analog Devices Wavelet Codec" status working

1 0

r37875 - trunk/libmpcodecs/vf_screenshot.c
by rtogni 03 Jul '16

03 Jul '16

Author: rtogni Date: Sun Jul 3 22:06:11 2016 New Revision: 37875 Log: Fix crash with screenshot filter. avcodec_open2() now requires timebase to be always set, even for png images. The patch sets it to 1/1, since pictures do not have a framerate. Patch by Thomas Kirsten (Tho_Ki gmx de) Modified: trunk/libmpcodecs/vf_screenshot.c Modified: trunk/libmpcodecs/vf_screenshot.c ============================================================================== --- trunk/libmpcodecs/vf_screenshot.c Sun Jul 3 21:09:28 2016 (r37874) +++ trunk/libmpcodecs/vf_screenshot.c Sun Jul 3 22:06:11 2016 (r37875) @@ -81,6 +81,8 @@ static int config(struct vf_instance *vf vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24; vf->priv->avctx->width = d_width; vf->priv->avctx->height = d_height; + vf->priv->avctx->time_base.num = 1; + vf->priv->avctx->time_base.den = 1; vf->priv->avctx->compression_level = 0; if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) { mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n");

1 0

r37874 - trunk/configure
by rtogni 03 Jul '16

03 Jul '16

Author: rtogni Date: Sun Jul 3 21:09:28 2016 New Revision: 37874 Log: Always define HAVE_VSX Fixes xompilation after ffmpeg swscale optimizations for POWER8 VSX SIMD (commit 1df908f33f658979b32599489ca6f1a39821013c) Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jul 1 17:32:51 2016 (r37873) +++ trunk/configure Sun Jul 3 21:09:28 2016 (r37874) @@ -2044,6 +2044,7 @@ def_av_fast_unaligned='#define AV_HAVE_F def_local_aligned_8='#define HAVE_LOCAL_ALIGNED_8 0' def_local_aligned_16='#define HAVE_LOCAL_ALIGNED_16 0' def_local_aligned_32='#define HAVE_LOCAL_ALIGNED_32 0' +def_vsx='#define HAVE_VSX 0' arch_all='X86 IA64 SPARC ARM AVR32 SH4 PPC ALPHA MIPS PA_RISC S390 S390X VAX BFIN XTENSA TOMI GENERIC AARCH64' subarch_all='X86_32 X86_64 PPC64' case "$host_arch" in

1 0

r37873 - trunk/TOOLS/mp-uncrustify-style.cfg
by ib 01 Jul '16

01 Jul '16

Author: ib Date: Fri Jul 1 17:32:51 2016 New Revision: 37873 Log: Prefer '// A' to '//A'. This reapplies r37613 (less aggressively). Uncrustify 0.63 can finally handle all doxygen comments including grouping comments using option sp_cmt_cpp_doxygen. Thus update required version of uncrustify to 0.63 (although no option newer than 0.57 appears). Modified: trunk/TOOLS/mp-uncrustify-style.cfg Modified: trunk/TOOLS/mp-uncrustify-style.cfg ============================================================================== --- trunk/TOOLS/mp-uncrustify-style.cfg Sun Jun 12 17:33:25 2016 (r37872) +++ trunk/TOOLS/mp-uncrustify-style.cfg Fri Jul 1 17:32:51 2016 (r37873) @@ -1,4 +1,4 @@ -# Uncrustify >= 0.62 +# Uncrustify >= 0.63 ### MPlayer coding style @@ -158,6 +158,12 @@ sp_cond_colon # Add or remove space around the '?' in 'b ? t : f' sp_cond_question = force # ignore/add/remove/force +# Control the space after the opening of a C++ comment '// A' vs '//A' +sp_cmt_cpp_start = add # ignore/add/remove/force + +# TRUE: If space is added with sp_cmt_cpp_start, do it after doxygen sequences like '///', '///<', '//!' and '//!<'. +sp_cmt_cpp_doxygen = true # false/true + # # Code alignment (not left column spaces/tabs) #

1 0