head 1.9; access; symbols pkgsrc-2015Q3:1.8.0.26 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.24 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.22 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.20 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.18 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.16 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.14 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.12 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.10 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.6 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.4 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.2 pkgsrc-2012Q3-base:1.8 pkgsrc-2011Q4:1.7.0.12 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.10 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.8 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.6 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.4 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.2 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.2 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.3.0.8 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.6 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.4 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.2 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.2.0.4 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.2 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.9 date 2015.10.25.11.00.18; author wiz; state dead; branches; next 1.8; commitid aDqFOpgsm8C0NtGy; 1.8 date 2012.08.30.18.54.42; author christos; state Exp; branches; next 1.7; 1.7 date 2008.09.08.18.58.24; author ahoka; state dead; branches; next 1.6; 1.6 date 2008.04.20.15.31.03; author tonnerre; state Exp; branches; next 1.5; 1.5 date 2008.02.28.16.18.53; author kefren; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2008.02.20.13.11.00; author xtraeme; state dead; branches; next 1.3; 1.3 date 2007.01.13.07.32.36; author wiz; state Exp; branches; next 1.2; 1.2 date 2006.09.26.07.27.19; author martti; state dead; branches; next 1.1; 1.1 date 2006.04.28.23.16.29; author wiz; state Exp; branches; next ; 1.5.2.1 date 2008.04.24.13.27.08; author rtr; state Exp; branches; next ; desc @@ 1.9 log @Update vlc to 2.2.1. Based on the wip version by Ian D. Leroux and Tobias Nygren. 2.2.1 Highlights VLC 2.2.1 "Terry Pratchett" is a fixed version of 2.2.0 "WeatherWax" It fixes numerous crashes (FLAC, SPC), codec issues (VP9, Atrac3, AAC), regressions and several issues (Resume, MP4 chapters, MKV over network) and security issues. 2.2.0 Highlights VLC 2.2.0 auto-rotates the videos taken from phones, to fight Vertical Video Syndrome! VLC now resumes where you left off in all versions Improves support for new HD codecs, VP9, opus and H.265/HEVC, for decoding and for encoding. Extensions are now downloadable from within the application. VLSub extension can download subtitles from the application. 2.2.x Features Core Auto-rotation of phone movies, to fight Vertical Video Syndrome Resume playback where you left off Extensions API and repository to download extensions directly from the application GPU 0-copy support for decoding and displaying using hardware Improved support for UltraHD codecs, notably H.265 and VP9 Subtitles download from the web, using OpenSubtitles Audio core upgrade, notably to support short samples Formats Support for BD-Java menus and overlay in Blu-Ray Acceleration of VP9 and H.265/HEVC decoders Rewritten support for WMV, Ogg, MP4 and AVI, notably for seeking Support for encoding in H.265, Opus and VP9 Support for WebVTT, Ogg/VP8, Opus/MKV, CAF Support for THP, Renderware and Escape Replay videogames files Support for SRT language detection Acceleration GPU 0-copy decoding-rendering for Android using MediaCodec GPU accelerated auto-rotation, in OpenGL, Direct3D and Mediacodec GPU 0-copy decoding-rendering for Linux using VDPAU Support for HLSL shaders in Direct3D video output Media Foundation Transform audio and video decoder for Windows Vista/7 GPU 0-copy decoding-rendering for RaspberryPi using MMAL OpenMAX IL improvements for Android, Linux and rPi Support GStreamer codecs on Linux Codecs / Protocols Support for MMS split streams for audio selection (European Parliament) Support FTPS (FTP/TLS) protocol New decoder for VP8 and VP9 using libvpx for Linux distributions without avcodec Improvements on Teletext, Subrip, and Tx3g subtitles Support for MSN audio, Atrac3+, VP7, Bink, TAK, On2 AVC, DK3, DK4 Support for IMC, Vivo g723.1, Smacker, FIC, Auravision, Canopus Lossless Support x264 and FFv1 codecs RGB modes Fixes for DVD, Audio-CD, M2TS LPCM audio, Speex Professional Support for Digital Cinema Packages and encrypted DCP with KDM HEVC encoding and muxing in MP4 and TS Support VP8 encoding inside Ogg Improvements of audio bar graph, for speed and resiliance Support MPEG-2 video encoding through x262 Large improvements of teletext rendering, for speed and alignments Platform integration Port of the interface to Yosemite Support drag'n drop in the skins2 interface New TLS module on OS X and iOS, using the central store Signature of the Windows binaries Improvement of audio device detections on OS X and Windows Support of audio ducking in various audio outputs Mobile Versions VLC for iOS 2.5.0 release is out VLC for Windows Phone 1.2.0 public beta is out VLC for WinRT 1.2.0, x86 and ARM VLC for Android TV 1.2.6 VLC for Android 1.2.6 For developers Add equalizer API for libVLC Add functions for scrambling detection Experimental new C++11 libVLC library: libvlcpp New Android buildsystem and Java SDK New WinRT library component for libVLC: libVLCX Improvements for iOS/OSX VLCKit: Swift support and ARC Android Complete switch to Material design, including black theme Support for Audio playlists and modtracker files Support for AC-3 Passthrough and 5.1/7.1 audio Support switch to background video playback Large improvements on the first Android TV release Support chapter selections iOS Support for iCloud, box.com and OneDrive Support 10-band equalizer Support sharing media between devices Support Chapters and Title selections New player design Add media information dialog and timer for playback @ text @$NetBSD: patch-ad,v 1.8 2012/08/30 18:54:42 christos Exp $ --- modules/gui/qt4/components/interface_widgets.cpp 2011-07-12 21:11:24.000000000 +0300 +++ modules/gui/qt4/components/interface_widgets.cpp 2012-08-30 17:46:45.000000000 +0300 @@@@ -524,14 +524,14 @@@@ + qtr( "Double click to jump to a chosen time position" ) ); bufTimer->setSingleShot( true ); - CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ), - this, setDisplayPosition( float, int64_t, int ) ); + CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ), + this, setDisplayPosition( float, putime_t, int ) ); CONNECT( THEMIM->getIM(), cachingChanged( float ), this, updateBuffering( float ) ); CONNECT( bufTimer, timeout(), this, updateBuffering() ); } -void TimeLabel::setDisplayPosition( float pos, int64_t t, int length ) +void TimeLabel::setDisplayPosition( float pos, putime_t t, int length ) { showBuffering = false; bufTimer->stop(); @ 1.8 log @Make the slider work again. The problem here is that NetBSD defines int64_t as __int64_t, and when moc parses and creates the signal string prototype functions, it uses "int64_t", but when the code that calls them is compiled the strings formed are tokenized, so they become "__int64_t" so there is a mismatch. Fixing the NetBSD headers would be TRT to do, but it is too involved. Instead since the use of int64_t is limited in parameter types, define a new pctime_t as int64_t and use that instead. I think that moc functions should use only qt-specified typedefs to avoid portability problems anyway. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update to the latest 0.9 branch. Changes between 0.8.6i and 0.9.1: --------------------------------- Note: version 0.9.0 was skipped due to bugs being discovered at the last minute. Important notes: ---------------- * This release will not work with Windows 98/ME and Mac OS X 10.3.9 (Panther) * The HTTP interface is now only available on the local machine by default. If you want to make it available from other machines, you will have to edit the ".hosts" file. - On UNIX/Linux, the file is in /usr/share/vlc/http/.hosts If you're using the old http interface, it's located in /usr/share/vlc/http/old/.hosts - On Windows they are in C:\Program Files\VideoLAN\VLC\http\.hosts and C:\Program Files\VideoLAN\VLC\http\old\.hosts - On Mac OS X, you can find it in VLC.app/Contents/MacOS/share/http/.hosts and respectively in VLC.app/Contents/MacOS/share/http/old/.hosts * This version of VLC contains a new interface for Windows and Linux. This interface has a fullscreen controller and simplified preferences. This interface lacks the "Streaming Wizard" that used to be present in VLC 0.8.6. * The behavior of --sout-keep was changed. It's now activated by default. * The marq, mosaic and logo commands in the rc interface changed. They now require a target name as their first argument. Example: vlc --sub-filter "marq@@test{marquee=Hello}" -I rc You can then use commands like: @@test marq-marquee Goodbye If you didn't name the object using @@test, its name will default to the plugin name (hence 'marq') in this example. These new commands are also available in the telnet interface. * The "rtp" access output module has been removed. Please use the RTP stream output instead, e.g.: Old: '#std{access=rtp,mux=ts,dst=239.255.1.2:5004,sap}' New: '#rtp{mux=ts,dst=239.255.1.2,port=5004,sap}' * You now need to append --m3u-extvlcopt to your command line to enable EXTVLCOPT options parsing in m3u playlists. Note that only a limited set of options is available to m3u playlists (CVE-2007-6683). * The old access:url syntax is no longer supported to resolve ambiguities with some file names. Use access://url instead. E.g.: vlc:quit -> vlc://quit ; udp:@@239.255.12.12 -> udp://@@239.255.12.12 * The ffmpeg module has been removed and replaced by the new avcodec, avformat, swscale (or imgresample if you use a swscale-less ffmpeg build) and postproc modules. * The web plugins ActiveX (IE)/Firefox/Mozilla/Safari now recognize the following states: IDLE/CLOSE=0, OPENING=1, BUFFERING=2, PLAYING=3, PAUSED=4, STOPPING=5, FORWARD=6, BACKWARD=7, ENDED=8, ERROR=9. With FORWARD and BACKWARD being reserved for future implementations and are thus not functional atm. * Croping and padding in transcode are now done using the croppadd video filter. For example: transcode{vcodec=mp2v,vfilter=croppadd{cropttop=20,cropbottom=30,paddleft=100}} * Canvas setting in transcode is now done using the canvas video filter. For example: transcode{vcodec=mp2v,vfilter=canvas{width=640,height=480}} * Glide video output module has been removed. * Due to lack of maintainer, the Skins interface might not work properly. It does not work on windows for this version. Help is needed! Changes: -------- Security updates: * Updated libfreetype on Windows and Mac OS X (CVE-??) * TTA Parser improvements (CVE-2008-3732) * MMS Access Module improvements (CVE-2008-3794 ) Playlist: * Vastly improved playlist support: * Media library creation to save all your playlist items * "Live search" * Shoutcast TV listings * Audioscrobbler/Last.FM support * Album art support * User definable Lua playlist scripts. See share/lua/playlist/README.txt (Default scripts open YouTube, DailyMotion, metacafe and Google Video URLs) * User definable Lua album art fetcher scripts. See share/lua/meta/README.txt Inputs: * Video for Linux 2 (V4L2) input support * UDP-Lite transport for RTP/AVP * DCCP transport for RTP/AVP * Proxy support for MMSH stream * JACK audio input support * Input run time option (improved live stream recording) * BDA devices access module for DVB-C/S/T capture cards on Microsoft Windows * Re-written Screen access module for Mac OS X using OpenGL instead of QuickDraw * Screen module now supports partial screen capture and mouse following on X11. * Experimental EyeTV access module This requires the user to install a plugin to EyeTV.app (available as a separate download). * Simple RTP input (with MPEG A/V, G.711 and PCM support). * RTMP input support * QTKit-based Input module for Mac OS X allowing display and streaming of video taken from all iSight-labelled video cameras (no audio support) * HTTP access now supports gzip compressed data and Digest Access Authentication. * New options to reduce latency between arrival of raw data and display of frames. (--auto-adjust-pts-delay and --use-stream-immediate) Demuxers: * MP4 gpac and Apple chapter support * Fixed playback of AIFF stereo files * Fixed audio glitch on seek * Improved FLAC demuxer (duration / current time / meta data) * AAC tags support * APEv1/2 tags support * Improved ID3v2 tags support * Improved Ogg/Vorbis tags support * Raw video support * Standard MIDI File (types 0 & 1) support * TiVo Series 2 support * CD+G karaoke Files support * MXF files support * OMA support Decoders: * VP60/VP61/VP6F/VP62 support * Flash Screen Video support * CamStudio Screen Video support * DosBox Capture support * Karl Morton's Video support * limited atrac3 support * Fraps support * Fluidsynth MIDI software synthesis (with external sound fonts) * New codec FOURCCs to support more specific files: Avid, FCP, Sony, Samsung, ... * H.264 PAFF support * DNxHD / VC-3 support * NellyMoser ASAO support * APE (Monkey audio) support * RealVideo support (with the RealVideo run-time) * Dirac video support using libschroedinger Subtitles: * Closed Caption Decoder (DVD, ReplayTV, TiVo, DVB/ATSC) * VBI & EBU (Teletext) support (*nix, Mac OS) * Ogg/Kate subtitles support * AQTitle subtitles support * MKV USF subtitles support * HTML-based subtitles support * MPSub subtitles support * JacoSub subtitles basic support * MPL2 subtitles support * Rewrite of ASS/SSA scripts and subtitles support * PowerDivx (.psb) Subtitles support * Realtext subtitle support * DKS subtitle support * SubViewer 1.0 (SubRip09) subtitles support * Correct Right-to-left languages in subtitles support Encoders: * Flash Screen Video support * Improved H.264 encoding speed Video outputs and filters: * New CoreAnimation-based output module (VLCKit framework on OS X only) * Adjust, Invert and Distort (now split into Wave, Ripple, Gradient and Psychedelic) video filters can now be streamed * New puzzle video output filter * Re-written motion detection video filter * New extract video filter (extract Red, Green and Blue components from a video) * New sharpen video filter (increase the contrast of adjacent pixels) * New erase video filter (removes logos from a video) * Enhanced subtitles' renderer to support bold, italic and some HTML tags (Google Summer of Code Student project) * Support for RGBA and I420 blending. The latter improves Mosaic CPU usage *a lot*. * New transparency mask video filter (for use with the mosaic_bridge module). * New bluescreen video filter (for use with the mosaic_bridge module). This was previously part of the mosaic module. * Fixed random characters problem in RSS filter. * Add rotate-deciangle for more precision on rotate filter * Support for Intel SSE2 instruction set in chroma converters * Improved use of Intel MMX instruction set in chroma converters * New croppadd and canvas video filters. Audio outputs and filters: * Replay gain support * Audio playback when going slower/faster (with pitch correction via new scaletempo audio filter) * New spatializer audio filter * Correct DTS output via S/PDIF Stream output: * RTSP for TS-multiplexed broadcast streams * New RTP payload formats: * Speex voice audio codec * ITU T.140 (for text, subtitles) output * G.711 (both A-law and µ-law) output * UDP-Lite transport for RTP * DCCP transport for RTP * Lots of fixes for RTSP broadcasting * RTMP output Interfaces: * All * New Simple Preferences dialogs showing the most important settings in an end-user suitable way. * Improved user interaction * Improved mouse gestures * Vastly improved Update checker * Full support for meta data editing (ID3v2, Ogg/Vorbis, AAC, APEv1/2) * Windows/Linux * Brand new interface for Linux and Windows, based on the Qt toolkit * Fullscreen controller (transparency on Linux+Composite) * Mac OS X * Improved video output features * Online access to VideoLAN's Help Wiki within VLC * New setting to disable the "Recent Items" service * When playing Radio (live) streams, the current track is shown correctly * Correct appearance on Macs using Aqua's graphite theme * Simplified Extended Controls panel * Ncurses: * Correctly displays wide characters when using an UTF-8 locale, if libncursesw is available. * Some nice colors if the terminal supports it (most do) * Experimental Lua interface modules. See vlc -I lua and share/lua/playlist/README.txt for more info. * Unix * Option to allow only one running instance, using D-Bus interface. * D-Bus Interface implementing the MPRIS (Media Player Remote Interfacing specification), a common dbus control interface for media players that intends to become an xdg standard when finished: http://wiki.xmms2.xmms.se/index.php/Media_Player_Interfaces . * Motion module using disk accelerometers to keep video horizontal * Plugin to set Telepathy presence message using MissionControl * Fixed VLM schedule time on Linux Linux Port: * VLC now complies with the XDG Base Directory Specification version 0.6 http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html (which means that VLC doesn't use the $HOME/.vlc directory anymore) Mac OS X Port: * Mac OS X Framework "VLCKit" that can be used to embed VLC in third party applications (Google Summer of Code Student project, Mac OS X 10.5 only) * New text renderer based on Quartz replacing the existing Freetype solution * Complete compatibility with Mac OS X 10.5 Leopard * It is now required to compile a fully featured build * The support of Mac OS X 10.3.9 and QuickTime 6.x was discontinued. LibVLC: * Event management and various improvements in libvlc (Part of a Google Summer of Code Student project) New Localizations: * Finnish * Persian * Polish * Punjabi * Bulgarian Developers: * LibVLC now supports externally built plugins properly. A "vlc-plugin" pkg-config package is provided. * Java bindings are now built from a separate source. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2008/04/20 15:31:03 tonnerre Exp $ d3 5 a7 10 Fix compilability of CDDA code with modern libcdio versions. --- modules/access/cdda/cdda.h.orig 2008-03-23 22:41:48.000000000 +0000 +++ modules/access/cdda/cdda.h @@@@ -75,7 +75,7 @@@@ typedef enum { paranoia_none = 0, /* Note: We make use of 0 as being the same as false */ paranoia_overlap = 1, paranoia_full = 2 -} paranoia_mode_t; +} vlc_paranoia_mode_t; d9 8 a16 3 /***************************************************************************** @@@@ -107,7 +107,7 @@@@ typedef struct cdda_data_s d18 5 a22 7 #if LIBCDIO_VERSION_NUM >= 72 /* Paranoia support */ - paranoia_mode_t e_paranoia; /* Use cd paranoia for reads? */ + vlc_paranoia_mode_t e_paranoia; /* Use cd paranoia for reads? */ cdrom_drive_t *paranoia_cd; /* Place to store drive handle given by paranoia. */ cdrom_paranoia_t *paranoia; @ 1.6 log @Update vlc to version 0.8.6f, also applying some smaller patches: - Wrong boundary check in Speex decoder (CVE-2008-1686). - Compilability of CDDA code with modern libcdio versions. Vendor updates in 0.8.6f - Security vulnerabilities in the Subtitle demuxer, Real RTSP demuxer, MP4 demuxer and Cinepak codec: CVE-2007-6681, CVE-2008-0073, CVE-2008-1489, CVE-2008-1769). - Crashes in H264 packetizer. - Close MMS access on network timeout. - Some problems with AAC decoder & packetizer. Vendor updates in 0.8.6e: - Security vulnerabilities in the Web interface, Subtitle demuxer, Real RTSP demuxer, SDL_image library and MP4 demuxer (CVE-2007-6681, CVE-2007-6682, CVE-2006-4484, CVE-2008-0225, CVE-2008-0295, CVE-2008-0296, CORE-2008-0130). - Resume playback for viewing content over FTP. - Fixed XShm detection with remote X11. - DTS to S/PDIF converter fixes. - Waiting for SPS/PPS problem in H.264 packetizer. - Improved compatibility for creating H.264 video files playable on iPhones. Approved-by: joerg @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Fix SA29122: MP4 Demuxer Arbitrary Memory Overwrite @ text @d2 23 a24 17 Index: modules/demux/mp4/mp4.c =================================================================== --- modules/demux/mp4/mp4.c (revision 24943) +++ modules/demux/mp4/mp4.c (revision 24944) @@@@ -1151,6 +1151,12 @@@@ for( i_chunk = p_stsc->data.p_stsc->i_first_chunk[i_index] - 1; i_chunk < i_last; i_chunk++ ) { + if( i_chunk >= p_demux_track->i_chunk_count ) + { + msg_Warn( p_demux, "corrupted chunk table" ); + return VLC_EGENERIC; + } + p_demux_track->chunk[i_chunk].i_sample_description_index = p_stsc->data.p_stsc->i_sample_description_index[i_index]; p_demux_track->chunk[i_chunk].i_sample_count = @ 1.5.2.1 log @pullup ticket #2346 - requested by tonnerre fixes several security vulnerabilities Revisions pulled up: - pkgsrc/multimedia/vlc/Makefile 1.52 - pkgsrc/multimedia/vlc/distinfo 1.16 - pkgsrc/multimedia/vlc/patches/patch-ac 1.4 - pkgsrc/multimedia/vlc/patches/patch-ad 1.6 - pkgsrc/multimedia/vlc/patches/patch-ae removed Module Name: pkgsrc Committed By: tonnerre Date: Sun Apr 20 15:31:03 UTC 2008 Modified Files: pkgsrc/multimedia/vlc: Makefile distinfo pkgsrc/multimedia/vlc/patches: patch-ac patch-ad Removed Files: pkgsrc/multimedia/vlc/patches: patch-ae Log Message: Update vlc to version 0.8.6f, also applying some smaller patches: - Wrong boundary check in Speex decoder (CVE-2008-1686). - Compilability of CDDA code with modern libcdio versions. Vendor updates in 0.8.6f - Security vulnerabilities in the Subtitle demuxer, Real RTSP demuxer, MP4 demuxer and Cinepak codec: CVE-2007-6681, CVE-2008-0073, CVE-2008-1489, CVE-2008-1769). - Crashes in H264 packetizer. - Close MMS access on network timeout. - Some problems with AAC decoder & packetizer. Vendor updates in 0.8.6e: - Security vulnerabilities in the Web interface, Subtitle demuxer, Real RTSP demuxer, SDL_image library and MP4 demuxer (CVE-2007-6681, CVE-2007-6682, CVE-2006-4484, CVE-2008-0225, CVE-2008-0295, CVE-2008-0296, CORE-2008-0130). - Resume playback for viewing content over FTP. - Fixed XShm detection with remote X11. - DTS to S/PDIF converter fixes. - Waiting for SPS/PPS problem in H.264 packetizer. - Improved compatibility for creating H.264 video files playable on iPhones. Approved-by: joerg @ text @d1 18 a18 24 $NetBSD: patch-ad,v 1.5 2008/02/28 16:18:53 kefren Exp $ Fix compilability of CDDA code with modern libcdio versions. --- modules/access/cdda/cdda.h.orig 2008-03-23 22:41:48.000000000 +0000 +++ modules/access/cdda/cdda.h @@@@ -75,7 +75,7 @@@@ typedef enum { paranoia_none = 0, /* Note: We make use of 0 as being the same as false */ paranoia_overlap = 1, paranoia_full = 2 -} paranoia_mode_t; +} vlc_paranoia_mode_t; /***************************************************************************** @@@@ -107,7 +107,7 @@@@ typedef struct cdda_data_s #if LIBCDIO_VERSION_NUM >= 72 /* Paranoia support */ - paranoia_mode_t e_paranoia; /* Use cd paranoia for reads? */ + vlc_paranoia_mode_t e_paranoia; /* Use cd paranoia for reads? */ cdrom_drive_t *paranoia_cd; /* Place to store drive handle given by paranoia. */ cdrom_paranoia_t *paranoia; @ 1.4 log @Update to 0.8.6d (latest stable version), based on wip/vlc update done by Adam Hoka (thank you!). Changes between 0.8.6c and 0.8.6d: ---------------------------------------------------------- Various bugfixes: * Mozilla plugin: supports a reasonable amount of MIME types on Windows * Linux: Fixed S/PDIF passthrough with ALSA * Automatic recovery on unexpected stream discontinuity (clock gap) occurrences in input * Use field order (top/bottom) for correct bob/linear deinterlacing * Fix invalid free in bookmarks loading code Windows and Mac OS Binaries * FLAC Security Update (CVE-2007-4619) to prevent multiple integer overflows Active X plugin: * Security update (VideoLAN-SA-0703) Mac OS X Interface & Port: * Apple Remote support on Mac OS X 10.5 Leopard with enhanced functionality * Improved Video Output compatibility for Mac OS X 10.5 Leopard * Improved behavior of the Fullscreen Controller and mode changes between Fullscreen and Windowed Video Output * Softened the white flash artifacts that may appear during the transition of two different movies * Support for current Ogg file formats NOTE: This release requires Mac OS X 10.4 or higher. Mac OS X 10.3.9 is not supported anymore. Encoders: * Improved H.264 encoding speed on Mac OS X Other changes: * The automatic updating facility was removed * You now need to append --m3u-extvlcopt to your command line to enable EXTVLCOPT options parsing in m3u playlists. ...and more, see the NEWS file. @ text @d1 18 a18 165 $NetBSD: patch-ad,v 1.3 2007/01/13 07:32:36 wiz Exp $ --- modules/codec/flac.c.orig 2006-05-06 15:52:19.000000000 +0000 +++ modules/codec/flac.c @@@@ -33,6 +33,12 @@@@ # include # include # define USE_LIBFLAC + /* by LEGACY_FLAC we mean before FLAC 1.1.3 when the decoder/encoder APIs were simplified */ +# if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 +# define LEGACY_FLAC +# else +# undef LEGACY_FLAC +# endif #endif #include "vlc_block_helper.h" @@@@ -133,7 +139,12 @@@@ static int SyncInfo( decoder_t *, uint8_ #ifdef USE_LIBFLAC static FLAC__StreamDecoderReadStatus DecoderReadCallback( const FLAC__StreamDecoder *decoder, - FLAC__byte buffer[], unsigned *bytes, void *client_data ); +#ifdef LEGACY_FLAC + FLAC__byte buffer[], unsigned *bytes, +#else + FLAC__byte buffer[], size_t *bytes, +#endif + void *client_data ); static FLAC__StreamDecoderWriteStatus DecoderWriteCallback( const FLAC__StreamDecoder *decoder, @@@@ -223,6 +234,7 @@@@ static int OpenDecoder( vlc_object_t *p_ return VLC_EGENERIC; } +#ifdef LEGACY_FLAC FLAC__stream_decoder_set_read_callback( p_sys->p_flac, DecoderReadCallback ); FLAC__stream_decoder_set_write_callback( p_sys->p_flac, @@@@ -233,7 +245,12 @@@@ static int OpenDecoder( vlc_object_t *p_ DecoderErrorCallback ); FLAC__stream_decoder_set_client_data( p_sys->p_flac, p_dec ); + /* really should check the return value here */ FLAC__stream_decoder_init( p_sys->p_flac ); +#else + /* really should check the return value here */ + FLAC__stream_decoder_init_stream( p_sys->p_flac, DecoderReadCallback, NULL, NULL, NULL, NULL, DecoderWriteCallback, DecoderMetadataCallback, DecoderErrorCallback, p_dec ); +#endif #endif /* Set output properties */ @@@@ -535,7 +552,12 @@@@ static aout_buffer_t *DecodeBlock( decod *****************************************************************************/ static FLAC__StreamDecoderReadStatus DecoderReadCallback( const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], - unsigned *bytes, void *client_data ) +#ifdef LEGACY_FLAC + unsigned *bytes, +#else + size_t *bytes, +#endif + void *client_data ) { decoder_t *p_dec = (decoder_t *)client_data; decoder_sys_t *p_sys = p_dec->p_sys; @@@@ -660,6 +682,11 @@@@ static void DecoderErrorCallback( const msg_Err( p_dec, "frame's data did not match the CRC in the " "footer." ); break; +#ifndef LEGACY_FLAC + case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM: + msg_Err( p_dec, "the decoder encountered reserved fields in use in the stream." ); + break; +#endif default: msg_Err( p_dec, "got decoder error: %d", status ); } @@@@ -722,16 +749,11 @@@@ static void decoder_state_error( decoder case FLAC__STREAM_DECODER_END_OF_STREAM: msg_Dbg( p_dec, "the decoder has reached the end of the stream." ); break; - case FLAC__STREAM_DECODER_ABORTED: - msg_Warn( p_dec, "the decoder was aborted by the read callback." ); - break; +#ifdef LEGACY_FLAC case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM: msg_Warn( p_dec, "the decoder encountered reserved fields in use " "in the stream." ); break; - case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: - msg_Err( p_dec, "error when allocating memory." ); - break; case FLAC__STREAM_DECODER_ALREADY_INITIALIZED: msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the " "decoder was already initialized, usually because " @@@@ -741,6 +763,20 @@@@ static void decoder_state_error( decoder msg_Err( p_dec, "FLAC__stream_decoder_init() was called without " "all callbacks being set." ); break; +#else + case FLAC__STREAM_DECODER_OGG_ERROR: + msg_Warn( p_dec, "an error occurred in the underlying Ogg layer." ); + break; + case FLAC__STREAM_DECODER_SEEK_ERROR: + msg_Warn( p_dec, "an error occurred while seeking." ); + break; +#endif + case FLAC__STREAM_DECODER_ABORTED: + msg_Warn( p_dec, "the decoder was aborted by the read callback." ); + break; + case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: + msg_Err( p_dec, "error when allocating memory." ); + break; case FLAC__STREAM_DECODER_UNINITIALIZED: msg_Err( p_dec, "decoder in uninitialized state." ); break; @@@@ -1138,7 +1174,11 @@@@ static block_t *Encode( encoder_t *, aou static FLAC__StreamEncoderWriteStatus EncoderWriteCallback( const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], +#ifdef LEGACY_FLAC unsigned bytes, unsigned samples, +#else + size_t bytes, unsigned samples, +#endif unsigned current_frame, void *client_data ); static void EncoderMetadataCallback( const FLAC__StreamEncoder *encoder, @@@@ -1185,15 +1225,23 @@@@ static int OpenEncoder( vlc_object_t *p_ FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 ); p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE; +#ifdef LEGACY_FLAC FLAC__stream_encoder_set_write_callback( p_sys->p_flac, EncoderWriteCallback ); FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac, EncoderMetadataCallback ); FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc ); +#endif /* Get and store the STREAMINFO metadata block as a p_extra */ p_sys->p_chain = 0; +#ifdef LEGACY_FLAC + /* really should check the return value here */ FLAC__stream_encoder_init( p_sys->p_flac ); +#else + /* really should check the return value here */ + FLAC__stream_encoder_init_stream( p_sys->p_flac, EncoderWriteCallback, NULL, NULL, EncoderMetadataCallback, p_enc ); +#endif return VLC_SUCCESS; } @@@@ -1270,7 +1318,11 @@@@ static void EncoderMetadataCallback( con static FLAC__StreamEncoderWriteStatus EncoderWriteCallback( const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], +#ifdef LEGACY_FLAC unsigned bytes, unsigned samples, +#else + size_t bytes, unsigned samples, +#endif unsigned current_frame, void *client_data ) { encoder_t *p_enc = (encoder_t *)client_data; @ 1.3 log @Enable flac support. Patch for flac-1.1.3 support from ftp.altlinux.org /pub/people/thresh Bump PKGREVISION. Tested by joerg@@. Clean up pkglint warnings and remove a SUBST which doesn't do anything (says an INFO message). @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Moved vlc08 to vlc. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2006/04/28 23:16:29 wiz Exp $ d3 163 a165 20 --- modules/gui/wxwindows/streamout.cpp.orig 2004-05-16 11:42:29.000000000 +0000 +++ modules/gui/wxwindows/streamout.cpp @@@@ -166,7 +166,7 @@@@ SoutDialog::SoutDialog( intf_thread_t *_ wxStaticText *mrl_label = new wxStaticText( panel, -1, wxU(_("Destination Target:"))); mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""), - wxPoint(20,25), wxSize(120, -1), 0, NULL ); + wxPoint(20,25), wxSize(120, -1), 0, (const wxString*)NULL ); mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing " "the full MRL you want to open.\n""Alternatively, the field will be " "filled automatically when you use the controls below")) ); @@@@ -447,7 +447,7 @@@@ wxPanel *SoutDialog::AccessPanel( wxWind subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 ); label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) ); file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""), - wxPoint(20,25), wxSize(200, -1), 0, NULL ); + wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL ); wxButton *browse_button = new wxButton( access_subpanels[1], FileBrowse_Event, wxU(_("Browse...")) ); subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); @ 1.1 log @Add casts for amd64, reported by Rhialto. Fix typos in SUBST_MESSAGE* Add missing x11.buildlink3.mk. Remove two files from PLIST, because they are not built on my 3.99.18/i386 test system. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @