November 2015 - MPlayer-cvslog - lists.mplayerhq.hu

r37561 - trunk/gui/dialog/fileselect.c
by ib 25 Nov '15

25 Nov '15

Author: ib Date: Wed Nov 25 14:55:58 2015 New Revision: 37561 Log: Cosmetic: Adjust indent. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Wed Nov 25 14:55:12 2015 (r37560) +++ trunk/gui/dialog/fileselect.c Wed Nov 25 14:55:58 2015 (r37561) @@ -64,25 +64,25 @@ int fsType; static gint fsCurrFNameListSelected, fsLastFNameListSelected; char *fsVideoAudioFilterNames[][2] = { - { MSGTR_GUI_FilterVideoAvi, "*.avi" }, - { MSGTR_GUI_FilterVideoDivX, "*.divx" }, - { MSGTR_GUI_FilterVideoFlash, "*.flv" }, - { MSGTR_GUI_FilterFileMP3, "*.mp3" }, - { MSGTR_GUI_FilterFileMP4, "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" }, - { MSGTR_GUI_FilterFileMPEG, "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" }, - { MSGTR_GUI_FilterFileMP2TS, "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" }, - { MSGTR_GUI_FilterMediumMatroska, "*.mka,*.mkv" }, - { MSGTR_GUI_FilterMediumOgg, "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" }, - { MSGTR_GUI_FilterMediumQuickTime, "*.moov,*.mov,*.qt,*.qtvr" }, - { MSGTR_GUI_FilterMediumRealNetworks, "*.ra,*.rm,*.rmvb,*.rv" }, - { MSGTR_GUI_FilterImageCue, "*.cue" }, - { MSGTR_GUI_FilterFileWav, "*.wav" }, - { MSGTR_GUI_FilterMediumWindows, "*.asf,*.wma,*.wmv" }, - { MSGTR_GUI_FilterFilePlaylist, "*.asx,*.m3u,*.m3u8,*.m4u,*.mxu,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, - { MSGTR_GUI_FilterAudioAll, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, + { MSGTR_GUI_FilterVideoAvi, "*.avi" }, + { MSGTR_GUI_FilterVideoDivX, "*.divx" }, + { MSGTR_GUI_FilterVideoFlash, "*.flv" }, + { MSGTR_GUI_FilterFileMP3, "*.mp3" }, + { MSGTR_GUI_FilterFileMP4, "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" }, + { MSGTR_GUI_FilterFileMPEG, "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" }, + { MSGTR_GUI_FilterFileMP2TS, "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" }, + { MSGTR_GUI_FilterMediumMatroska, "*.mka,*.mkv" }, + { MSGTR_GUI_FilterMediumOgg, "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" }, + { MSGTR_GUI_FilterMediumQuickTime, "*.moov,*.mov,*.qt,*.qtvr" }, + { MSGTR_GUI_FilterMediumRealNetworks, "*.ra,*.rm,*.rmvb,*.rv" }, + { MSGTR_GUI_FilterImageCue, "*.cue" }, + { MSGTR_GUI_FilterFileWav, "*.wav" }, + { MSGTR_GUI_FilterMediumWindows, "*.asf,*.wma,*.wmv" }, + { MSGTR_GUI_FilterFilePlaylist, "*.asx,*.m3u,*.m3u8,*.m4u,*.mxu,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, + { MSGTR_GUI_FilterAudioAll, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, { MSGTR_GUI_FilterVideoAll, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.apng,*.asf,*.avi,*.bdm,*.bdmv,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" }, - { MSGTR_GUI_FilterFileAll, "*" }, - { NULL, NULL } + { MSGTR_GUI_FilterFileAll, "*" }, + { NULL, NULL } }; int fsLastVideoAudioFilterSelected = -1;

1 0

r37560 - trunk/gui/dialog/fileselect.c
by ib 25 Nov '15

25 Nov '15

Author: ib Date: Wed Nov 25 14:55:12 2015 New Revision: 37560 Log: Add support for Animated Portable Network Graphics to the GUI. The file extension corresponding to this is .apng. See r37559. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Tue Nov 24 23:56:40 2015 (r37559) +++ trunk/gui/dialog/fileselect.c Wed Nov 25 14:55:12 2015 (r37560) @@ -80,7 +80,7 @@ char *fsVideoAudioFilterNames[][2] = { { MSGTR_GUI_FilterMediumWindows, "*.asf,*.wma,*.wmv" }, { MSGTR_GUI_FilterFilePlaylist, "*.asx,*.m3u,*.m3u8,*.m4u,*.mxu,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" }, { MSGTR_GUI_FilterAudioAll, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" }, - { MSGTR_GUI_FilterVideoAll, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" }, + { MSGTR_GUI_FilterVideoAll, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.apng,*.asf,*.avi,*.bdm,*.bdmv,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" }, { MSGTR_GUI_FilterFileAll, "*" }, { NULL, NULL } };

1 0

r37559 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by rtogni 24 Nov '15

24 Nov '15

Author: rtogni Date: Tue Nov 24 23:56:40 2015 New Revision: 37559 Log: Add support for video codecs: apng AVS CPiA (untested) EA TGQ and TQI Cryo HNM4 Canopus HQ RSCC/ISCC Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Nov 21 21:29:12 2015 (r37558) +++ trunk/etc/codecs.conf Tue Nov 24 23:56:40 2015 (r37559) @@ -25,6 +25,14 @@ videocodec ffansi dll ansi out BGR8 +videocodec ffavs + info "FFmpeg Audio Video Standard (game format)" + status working + fourcc "AVS " + driver ffmpeg + dll avs + out BGR8 + videocodec ffbinkvideo info "FFmpeg Bink Video" status working @@ -61,6 +69,30 @@ videocodec ffeamad dll eamad out YV12 +videocodec ffeatgq + info "FFmpeg EA TGQ" + status working + fourcc pQGT ; internal MPlayer FourCC + driver ffmpeg + dll eatgq + out YV12 + +videocodec ffeatqi + info "FFmpeg EA TQI" + status working + fourcc pIQT ; internal MPlayer FourCC + driver ffmpeg + dll eatqi + out YV12 + +videocodec ffhnm4 + info "FFmpeg Cryo Interactive Entertainment HMN4" + status working + fourcc HNM4 ; internal MPlayer FourCC + driver ffmpeg + dll hnm4video + out BGR8 + videocodec ffmvi1 info "FFmpeg Motion Pixels" status working @@ -126,6 +158,14 @@ videocodec ffkmvc driver ffmpeg dll "kmvc" +videocodec ffrscc + info "FFmpeg innoHeim/Rsupport Screen Capture Codec" + status working + fourcc RSCC,ISCC + driver ffmpeg + dll rscc + out BGRA + videocodec ffzmbv info "FFmpeg Zip Motion-Block Video" status working @@ -708,6 +748,15 @@ videocodec mpng driver mpng out BGR32,BGR24,BGR8,Y800 +videocodec ffapng + info "FFmpeg APNG" + status working + fourcc apng,APNG + driver ffmpeg + dll apng + out BGR32,BGR8,Y800,RGB64BE,RGB48BE,RGBA,RGB24,BGR8 + out Y8A,Y16BE + videocodec ffptx info "FFmpeg V.Flash PTX" status working @@ -2219,7 +2268,7 @@ videocodec ffh263 fourcc VX1K ; Agora Labs VX1000S H263 fourcc lsvm ; lsv h263 driver ffmpeg - dll h263 + dll h263p out YV12,I420,IYUV videocodec ffzygo @@ -2802,6 +2851,14 @@ videocodec canopushq dll "CUVCcodc.dll" out BGR24 +videocodec ffcanopushq + status working + info "FFmpeg Canopus HQ Codec" + fourcc CUVC + driver ffmpeg + dll hq_hqa + out 422P,422A + videocodec canopusll status working info "Canopus Lossless Codec" @@ -3073,6 +3130,15 @@ videocodec cjpg out UYVY out BGR24,BGR15 +videocodec ffcpia + info "CPiA webcam" + comment "decodes data from v4l2 source, untested" + status working + fourcc CPiA ; internal MPlayer FourCC + driver ffmpeg + dll cpia + out YV12 + videocodec kensington info "kensington webcam" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sat Nov 21 21:29:12 2015 (r37558) +++ trunk/libmpdemux/mp_taglists.c Tue Nov 24 23:56:40 2015 (r37559) @@ -109,6 +109,7 @@ static const struct AVCodecTag mp_codeci #if LIBAVUTIL_VERSION_MICRO >= 100 { AV_CODEC_ID_ATRAC3P, 0xE923AABF}, #endif + { AV_CODEC_ID_CPIA, MKTAG('C', 'P', 'i', 'A') }, { AV_CODEC_ID_DTS, 0x2001 }, { AV_CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, { AV_CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3') }, @@ -170,6 +171,7 @@ static const struct AVCodecTag mp_bmp_ta #if LIBAVUTIL_VERSION_MICRO >= 100 { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') }, #endif + { AV_CODEC_ID_HNM4_VIDEO, MKTAG('H', 'N', 'M', '4') }, { AV_CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I') }, { AV_CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V') }, { AV_CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V') }, @@ -183,6 +185,7 @@ static const struct AVCodecTag mp_bmp_ta #endif { AV_CODEC_ID_MXPEG, MKTAG('M', 'X', 'P', 'G') }, { AV_CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1') }, + { AV_CODEC_ID_APNG, MKTAG('a', 'p', 'n', 'g') }, { AV_CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V') }, { AV_CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V') }, { AV_CODEC_ID_RV10, MKTAG('R', 'V', '1', '0') }, @@ -196,8 +199,10 @@ static const struct AVCodecTag mp_bmp_ta { AV_CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, { AV_CODEC_ID_TMV, MKTAG('t', 'm', 'v', '8') }, { AV_CODEC_ID_TGV, MKTAG('f', 'V', 'G', 'T') }, + { AV_CODEC_ID_TGQ, MKTAG('p', 'Q', 'G', 'T') }, { AV_CODEC_ID_THP, MKTAG('T', 'H', 'P', 'V') }, { AV_CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q') }, + { AV_CODEC_ID_TQI, MKTAG('p', 'I', 'Q', 'T') }, { AV_CODEC_ID_TXD, MKTAG('T', 'X', 'D', 'V') }, { AV_CODEC_ID_VP6A, MKTAG('V', 'P', '6', 'A') }, { AV_CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V') },

1 0

r37558 - trunk/configure
by michael 21 Nov '15

21 Nov '15

Author: michael Date: Sat Nov 21 21:29:12 2015 New Revision: 37558 Log: configure: Add hypot detection for FFmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Nov 18 21:30:17 2015 (r37557) +++ trunk/configure Sat Nov 21 21:29:12 2015 (r37558) @@ -3430,7 +3430,7 @@ fi done -for func in atan2f fminf ldexpf powf; do +for func in atan2f fminf ldexpf powf hypot; do echocheck $func eval _$func=no statement_check math.h "${func}(1.0,1.0)" && eval _$func=yes @@ -9195,6 +9195,7 @@ $def_exp2 $def_exp2f $def_fminf $def_getaddrinfo +$def_hypot $def_isinf $def_isnan $def_ldexpf

1 0

r37557 - trunk/configure
by michael 18 Nov '15

18 Nov '15

Author: michael Date: Wed Nov 18 21:30:17 2015 New Revision: 37557 Log: configure: add MIPSDSP to preempt potential build failures Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Nov 18 17:18:56 2015 (r37556) +++ trunk/configure Wed Nov 18 21:30:17 2015 (r37557) @@ -9263,6 +9263,7 @@ $def_gnutls #define HAVE_LIBC_MSVCRT 0 #define HAVE_MACH_MACH_TIME_H 0 #define HAVE_MAPVIEWOFFILE 0 +#define HAVE_MIPSDSP 0 #define HAVE_MIPSDSPR1 0 #define HAVE_MIPSFPU 0 #define HAVE_MM_EMPTY 0

1 0

r37556 - in branches/1.2: . gui/wm/ws.c
by ib 18 Nov '15

18 Nov '15

Author: ib Date: Wed Nov 18 17:18:56 2015 New Revision: 37556 Log: Merge r37555 from trunk: Add missing XSync(). Modified: branches/1.2/ (props changed) branches/1.2/gui/wm/ws.c Modified: branches/1.2/gui/wm/ws.c ============================================================================== --- branches/1.2/gui/wm/ws.c Wed Nov 18 17:16:39 2015 (r37555) +++ branches/1.2/gui/wm/ws.c Wed Nov 18 17:18:56 2015 (r37556) @@ -1322,6 +1322,7 @@ void wsImageCreate(wsWindow *win, int w, win->xImage->data = win->Shminfo.shmaddr; win->Shminfo.readOnly = False; XShmAttach(wsDisplay, &win->Shminfo); + XSync(wsDisplay, False); shmctl(win->Shminfo.shmid, IPC_RMID, 0); } else #endif

1 0

r37555 - trunk/gui/wm/ws.c
by ib 18 Nov '15

18 Nov '15

Author: ib Date: Wed Nov 18 17:16:39 2015 New Revision: 37555 Log: Add missing XSync(). Otherwise X11 error BadShmSeg (invalid shared segment parameter) may occur while calling XShmPutImage(). It has been mistakenly remove in r36386. Patch by Leonardo Taccari, iamleot gmail com, who observed it on NetBSD. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Wed Nov 18 16:44:54 2015 (r37554) +++ trunk/gui/wm/ws.c Wed Nov 18 17:16:39 2015 (r37555) @@ -1322,6 +1322,7 @@ void wsImageCreate(wsWindow *win, int w, win->xImage->data = win->Shminfo.shmaddr; win->Shminfo.readOnly = False; XShmAttach(wsDisplay, &win->Shminfo); + XSync(wsDisplay, False); shmctl(win->Shminfo.shmid, IPC_RMID, 0); } else #endif

1 0

r37554 - trunk/etc/mplayer.desktop
by ib 18 Nov '15

18 Nov '15

Author: ib Date: Wed Nov 18 16:44:54 2015 New Revision: 37554 Log: Add MIME types for HTTP Live Streaming (HLS). The types are: application/vnd.apple.mpegurl application/x-mpegurl See r37547. Modified: trunk/etc/mplayer.desktop Modified: trunk/etc/mplayer.desktop ============================================================================== --- trunk/etc/mplayer.desktop Sat Nov 14 17:18:38 2015 (r37553) +++ trunk/etc/mplayer.desktop Wed Nov 18 16:44:54 2015 (r37554) @@ -29,4 +29,4 @@ TryExec=gmplayer Exec=gmplayer %F Terminal=false Categories=GTK;AudioVideo;Audio;Video;Player;TV; -MimeType=application/x-cd-image;application/x-cue;application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.adobe.flash.movie;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/aac;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/vnd.mpegurl;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;x-content/audio-cdda;x-content/audio-dvd;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd; +MimeType=application/x-cd-image;application/x-cue;application/x-mpegurl;application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.adobe.flash.movie;application/vnd.apple.mpegurl;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/aac;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/vnd.mpegurl;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;x-content/audio-cdda;x-content/audio-dvd;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd;

1 0

r37553 - trunk/configure
by michael 14 Nov '15

14 Nov '15

Author: michael Date: Sat Nov 14 17:18:38 2015 New Revision: 37553 Log: confiure: Fix build after 4c8d86eb18e2fc8fcd5819a33599422454fdeff8 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Nov 8 01:52:05 2015 (r37552) +++ trunk/configure Sat Nov 14 17:18:38 2015 (r37553) @@ -1584,7 +1584,7 @@ libavdecoders=$(filter_out_component dec 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') -libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT') +libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT TLS_SCHANNEL') libavfilters=$(filter_out_component filter 'FREI0R[A-Z0-9_]* LIB[A-Z0-9_]* MP OCV') # second pass command line parsing for options needing local FFmpeg checkout

2 1

r37552 - trunk/configure
by michael 08 Nov '15

08 Nov '15

Author: michael Date: Sun Nov 8 01:52:05 2015 New Revision: 37552 Log: configure: disable VC1_MMAL to avoid build failure Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Oct 22 21:35:02 2015 (r37551) +++ trunk/configure Sun Nov 8 01:52:05 2015 (r37552) @@ -1580,8 +1580,8 @@ 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_QSV H264_MMAL') -libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_QSV HEVC_QSV VC1_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP') +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') +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') libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT')

1 0