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

r37611 - trunk/configure
by michael 28 Jan '16

28 Jan '16

Author: michael Date: Thu Jan 28 23:46:33 2016 New Revision: 37611 Log: configure: disable mmal_mpeg4, fix build Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jan 27 14:13:17 2016 (r37610) +++ trunk/configure Thu Jan 28 23:46:33 2016 (r37611) @@ -1580,7 +1580,7 @@ libavmuxers=$(echo $libavmuxers_all) libavprotocols=$(echo $libavprotocols_all) libavfilters=$(echo $libavfilters_all) -libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_MMAL MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV H264_MMAL') +libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_MMAL MPEG4_MMAL MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV H264_MMAL') libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP')

1 0

r37610 - trunk/etc/codecs.conf
by cehoyos 27 Jan '16

27 Jan '16

Author: cehoyos Date: Wed Jan 27 14:13:17 2016 New Revision: 37610 Log: etc/codecs.conf: The FFmpeg DV Audio decoder now works fine with -demuxer avi. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed Jan 27 09:14:58 2016 (r37609) +++ trunk/etc/codecs.conf Wed Jan 27 14:13:17 2016 (r37610) @@ -6306,8 +6306,7 @@ audiocodec msnsiren audiocodec ffdvaudio info "FFmpeg Ulead DV" - comment "Needs lavf demuxer" - status buggy + status working format 0x215 format 0x216 driver ffmpeg

1 0

r37609 - trunk/etc/codecs.conf
by cehoyos 27 Jan '16

27 Jan '16

Author: cehoyos Date: Wed Jan 27 09:14:58 2016 New Revision: 37609 Log: etc/codecs.conf: Support FFmpeg Ulead DV Audio. Only works with the lavf demuxer. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Jan 24 20:52:42 2016 (r37608) +++ trunk/etc/codecs.conf Wed Jan 27 09:14:58 2016 (r37609) @@ -6304,6 +6304,15 @@ audiocodec msnsiren driver acm dll "sirenacm.dll" +audiocodec ffdvaudio + info "FFmpeg Ulead DV" + comment "Needs lavf demuxer" + status buggy + format 0x215 + format 0x216 + driver ffmpeg + dll dvaudio + audiocodec uleaddva info "Ulead DV ACM" status working

1 0

r37608 - tags/MPlayer-1.2.1
by rtogni 24 Jan '16

24 Jan '16

Author: rtogni Date: Sun Jan 24 20:52:42 2016 New Revision: 37608 Log: MPlayer 1.2.1 release Added: tags/MPlayer-1.2.1/ (props changed) - copied from r37607, branches/1.2/

1 0

r37607 - branches/1.2/Changelog
by rtogni 24 Jan '16

24 Jan '16

Author: rtogni Date: Sun Jan 24 20:36:41 2016 New Revision: 37607 Log: Final update for 1.2.1 Modified: branches/1.2/Changelog Modified: branches/1.2/Changelog ============================================================================== --- branches/1.2/Changelog Sun Jan 24 19:32:43 2016 (r37606) +++ branches/1.2/Changelog Sun Jan 24 20:36:41 2016 (r37607) @@ -6,6 +6,7 @@ MPlayer * misc GUI fixes * fix build regression in FreeBSD * fix many crashes with fuzzed files + * fix errors for multichannels files and pulseaudio >= 6 Other: * building with system FFmpeg libs is possible without a local copy of of private FFmpeg headers

1 0

r37606 - in branches/1.2: . libmpcodecs/ad_spdif.c
by rtogni 24 Jan '16

24 Jan '16

Author: rtogni Date: Sun Jan 24 19:32:43 2016 New Revision: 37606 Log: Merge r37605 from trunk Fix segfault with spdif Modified: branches/1.2/ (props changed) branches/1.2/libmpcodecs/ad_spdif.c Modified: branches/1.2/libmpcodecs/ad_spdif.c ============================================================================== --- branches/1.2/libmpcodecs/ad_spdif.c Sun Jan 24 19:30:16 2016 (r37605) +++ branches/1.2/libmpcodecs/ad_spdif.c Sun Jan 24 19:32:43 2016 (r37606) @@ -45,6 +45,7 @@ struct spdifContext { int out_buffer_size; uint8_t *out_buffer; uint8_t pb_buffer[OUTBUF_SIZE]; + int header_written; }; static int read_packet(void *p, uint8_t *buf, int buf_size) @@ -78,7 +79,7 @@ static int preinit(sh_audio_t *sh) static int init(sh_audio_t *sh) { - int i, x, in_size, srate, bps, *dtshd_rate; + int i, x, in_size, srate, bps, *dtshd_rate, res; unsigned char *start; double pts; static const struct { @@ -129,11 +130,13 @@ static int init(sh_audio_t *sh) break; } } - if (AVERROR_PATCHWELCOME == lavf_ctx->oformat->write_header(lavf_ctx)) { - mp_msg(MSGT_DECAUDIO,MSGL_INFO, + if ((res = avformat_write_header(lavf_ctx, NULL)) < 0) { + if (res == AVERROR_PATCHWELCOME) + mp_msg(MSGT_DECAUDIO,MSGL_INFO, "This codec is not supported by spdifenc.\n"); goto fail; } + spdif_ctx->header_written = 1; // get sample_rate & bitrate from parser x = ds_get_packet_pts(sh->ds, &start, &pts); @@ -292,8 +295,8 @@ static void uninit(sh_audio_t *sh) AVFormatContext *lavf_ctx = spdif_ctx->lavf_ctx; if (lavf_ctx) { - if (lavf_ctx->oformat) - lavf_ctx->oformat->write_trailer(lavf_ctx); + if (spdif_ctx->header_written) + av_write_trailer(lavf_ctx); av_freep(&lavf_ctx->pb); if (lavf_ctx->streams) { av_freep(&lavf_ctx->streams[0]->codec);

1 0

r37605 - trunk/libmpcodecs/ad_spdif.c
by rtogni 24 Jan '16

24 Jan '16

Author: rtogni Date: Sun Jan 24 19:30:16 2016 New Revision: 37605 Log: Fix segfault with sipdif Also fix sample reported by Gustavo Grieco SIGSEGV.PC.5555558f165d.STACK.c27a04484.CODE.1.ADDR.(nil).INSTR.mov____(%rax),%r9.fuzz with -ao null This closes trac #2277 Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Sun Jan 24 00:42:12 2016 (r37604) +++ trunk/libmpcodecs/ad_spdif.c Sun Jan 24 19:30:16 2016 (r37605) @@ -45,6 +45,7 @@ struct spdifContext { int out_buffer_size; uint8_t *out_buffer; uint8_t pb_buffer[OUTBUF_SIZE]; + int header_written; }; static int read_packet(void *p, uint8_t *buf, int buf_size) @@ -78,7 +79,7 @@ static int preinit(sh_audio_t *sh) static int init(sh_audio_t *sh) { - int i, x, in_size, srate, bps, *dtshd_rate; + int i, x, in_size, srate, bps, *dtshd_rate, res; unsigned char *start; double pts; static const struct { @@ -129,11 +130,13 @@ static int init(sh_audio_t *sh) break; } } - if (AVERROR_PATCHWELCOME == lavf_ctx->oformat->write_header(lavf_ctx)) { - mp_msg(MSGT_DECAUDIO,MSGL_INFO, + if ((res = avformat_write_header(lavf_ctx, NULL)) < 0) { + if (res == AVERROR_PATCHWELCOME) + mp_msg(MSGT_DECAUDIO,MSGL_INFO, "This codec is not supported by spdifenc.\n"); goto fail; } + spdif_ctx->header_written = 1; // get sample_rate & bitrate from parser x = ds_get_packet_pts(sh->ds, &start, &pts); @@ -292,8 +295,8 @@ static void uninit(sh_audio_t *sh) AVFormatContext *lavf_ctx = spdif_ctx->lavf_ctx; if (lavf_ctx) { - if (lavf_ctx->oformat) - lavf_ctx->oformat->write_trailer(lavf_ctx); + if (spdif_ctx->header_written) + av_write_trailer(lavf_ctx); av_freep(&lavf_ctx->pb); if (lavf_ctx->streams) { av_freep(&lavf_ctx->streams[0]->codec);

1 0

r37604 - trunk/libmpcodecs/ad.c
by rtogni 23 Jan '16

23 Jan '16

Author: rtogni Date: Sun Jan 24 00:42:12 2016 New Revision: 37604 Log: Remove reference to ad_dk4adpcm decoder The decoder was removed lonmg ago, this was probably forgotten Modified: trunk/libmpcodecs/ad.c Modified: trunk/libmpcodecs/ad.c ============================================================================== --- trunk/libmpcodecs/ad.c Sun Jan 24 00:34:57 2016 (r37603) +++ trunk/libmpcodecs/ad.c Sun Jan 24 00:42:12 2016 (r37604) @@ -41,7 +41,6 @@ extern const ad_functions_t mpcodecs_ad_ extern const ad_functions_t mpcodecs_ad_pcm; extern const ad_functions_t mpcodecs_ad_dvdpcm; extern const ad_functions_t mpcodecs_ad_alaw; -extern const ad_functions_t mpcodecs_ad_dk4adpcm; extern const ad_functions_t mpcodecs_ad_dshow; extern const ad_functions_t mpcodecs_ad_dmo; extern const ad_functions_t mpcodecs_ad_acm;

1 0

r37603 - in trunk: Makefile etc/codecs.conf libmpcodecs/ad.c libmpcodecs/ad_dk3adpcm.c libmpcodecs/ad_imaadpcm.c libmpcodecs/ad_msadpcm.c
by rtogni 23 Jan '16

23 Jan '16

Author: rtogni Date: Sun Jan 24 00:34:57 2016 New Revision: 37603 Log: Remove internal audio decoders ad_dk3adpcm, ad_imaadpcm, ad_msadpcm The formats involved are ad_dk3adpcm.c DK3 adpcm ad_imaadpcm.c MS ima adpcm, QT ima adpcm, DK4 adpcm ad_msadpcm.c MS adpcm FFmpeg decoder was already preferred for all of them. Deleted: trunk/libmpcodecs/ad_dk3adpcm.c trunk/libmpcodecs/ad_imaadpcm.c trunk/libmpcodecs/ad_msadpcm.c Modified: trunk/Makefile trunk/etc/codecs.conf trunk/libmpcodecs/ad.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Jan 23 13:01:31 2016 (r37602) +++ trunk/Makefile Sun Jan 24 00:34:57 2016 (r37603) @@ -293,12 +293,9 @@ SRCS_COMMON = asxparser.c libaf/window.c \ libmpcodecs/ad.c \ libmpcodecs/ad_alaw.c \ - libmpcodecs/ad_dk3adpcm.c \ libmpcodecs/ad_dvdpcm.c \ libmpcodecs/ad_hwac3.c \ libmpcodecs/ad_hwmpa.c \ - libmpcodecs/ad_imaadpcm.c \ - libmpcodecs/ad_msadpcm.c \ libmpcodecs/ad_pcm.c \ libmpcodecs/dec_audio.c \ libmpcodecs/dec_teletext.c \ Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Jan 23 13:01:31 2016 (r37602) +++ trunk/etc/codecs.conf Sun Jan 24 00:34:57 2016 (r37603) @@ -4924,14 +4924,6 @@ audiocodec ffadpcmimawav driver ffmpeg dll adpcm_ima_wav -audiocodec imaadpcm - info "IMA ADPCM" - status working - format 0x11 - fourcc ima4 ; (MOV files) - format 0x1100736d ; "ms\x00\x11" (MOV files) - driver imaadpcm - audiocodec ffzorkpcm info "FFmpeg PCM Zork audio" status working @@ -4948,13 +4940,6 @@ audiocodec ffadpcmms driver ffmpeg dll adpcm_ms -audiocodec msadpcm - info "MS ADPCM" - status working - format 0x2 - format 0x0200736d ; "ms\x00\x02" (MOV files) - driver msadpcm - audiocodec ffadpcmoki info "FFmpeg ADPCM IMA Dialogic OKI" status working @@ -4999,13 +4984,6 @@ audiocodec ffadpcmimadk4 driver ffmpeg dll adpcm_ima_dk4 -audiocodec dk4adpcm - info "Duck DK4 ADPCM (rogue format number)" - status working - format 0x61 ; This format number was used by Duck Corp. but not officially - ; registered with Microsoft - driver imaadpcm - audiocodec ffadpcmimadk3 info "FFmpeg DK3 IMA ADPCM audio" status working @@ -5035,13 +5013,6 @@ audiocodec ffadpcmimaeaeacs driver ffmpeg dll adpcm_ima_ea_eacs -audiocodec dk3adpcm - info "Duck DK3 ADPCM (rogue format number)" - status working - format 0x62 ; This format number was used by Duck Corp. but not officially - ; registered with Microsoft - driver dk3adpcm - audiocodec ffroqaudio info "Id RoQ File Audio" status working Modified: trunk/libmpcodecs/ad.c ============================================================================== --- trunk/libmpcodecs/ad.c Sat Jan 23 13:01:31 2016 (r37602) +++ trunk/libmpcodecs/ad.c Sun Jan 24 00:34:57 2016 (r37603) @@ -41,9 +41,6 @@ extern const ad_functions_t mpcodecs_ad_ extern const ad_functions_t mpcodecs_ad_pcm; extern const ad_functions_t mpcodecs_ad_dvdpcm; extern const ad_functions_t mpcodecs_ad_alaw; -extern const ad_functions_t mpcodecs_ad_imaadpcm; -extern const ad_functions_t mpcodecs_ad_msadpcm; -extern const ad_functions_t mpcodecs_ad_dk3adpcm; extern const ad_functions_t mpcodecs_ad_dk4adpcm; extern const ad_functions_t mpcodecs_ad_dshow; extern const ad_functions_t mpcodecs_ad_dmo; @@ -77,9 +74,6 @@ const ad_functions_t * const mpcodecs_ad &mpcodecs_ad_pcm, &mpcodecs_ad_dvdpcm, &mpcodecs_ad_alaw, - &mpcodecs_ad_imaadpcm, - &mpcodecs_ad_msadpcm, - &mpcodecs_ad_dk3adpcm, #ifdef CONFIG_WIN32DLL &mpcodecs_ad_dshow, &mpcodecs_ad_dmo,

1 0

[propchange]: r37602 - svn:log
by michael 23 Jan '16

23 Jan '16

Author: michael Revision: 37602 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,5 @@ configure: fix build with latest ffmpeg build system changes -Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> \ No newline at end of file +Author: Andreas Cadhalpun <andreas.cadhalpun(a)googlemail.com> + +Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc>

1 0