summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* vidix: drop VIDIX supportUoti Urpala2011-01-3193-44226/+14
| | | | | | | | | | | | | By now VIDIX is too obscure to justify the amount of code and complexity it requires in the sources. Although there is no pressing need to drop it just now from a code point of view, I'll rather remove it before release than release with VIDIX support and then drop it later. Some of the manpage mentions of VIDIX were in "this option supported for these VOs" lists that looked outdated and failed to mention vdpau for example. Replace such incorrect lists with a generic "not supported for all VOs" mention.
* translation: remove \r and \n from translated PAUSE stringUoti Urpala2011-01-311-8/+3
|
* cosmetics: configure: Drop leading underscore from _need_* variablesdiego2011-01-311-24/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32816 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache: suggest increasing cache size in the "not filling!" messagereimar2011-01-311-1/+1
| | | | | | | Change "cache not filling" warning to include a hint to increase the cache size. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32815 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: add return_check and return_statement_check helpersdiego2011-01-311-30/+25
| | | | | | | | | | | | | | cosmetics: Move header_check helper function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32803 b3059339-0415-0410-9bf9-f77b7e298cf2 Add return_check() helper function and use it to simplify some checks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32805 b3059339-0415-0410-9bf9-f77b7e298cf2 Add return_statement_check() helper function and use it to simplify some checks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32806 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.c: simplify code a bit, remove "main:" labelcboesch2011-01-311-13/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32791 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: vo_md5sum: Remove unused define/undefcboesch2011-01-311-15/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32786 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/http: assume MakeMKV webservers always support rangesreimar2011-01-311-2/+6
| | | | | | | | | | | Add MakeMKV to list of webservers always supporting ranges even when they claim otherwise. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32785 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix hack to check for MakeMKV server being inverted. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32807 b3059339-0415-0410-9bf9-f77b7e298cf2
* TOOLS/: minor fixes in tool codesiretart2011-01-312-3/+9
| | | | | | | | | | | | | | | | | | | | | Fix printf format string warning fixes this warning: asfinfo.c: In function 'print_video_header': asfinfo.c:158: warning: format '%.4s' expects type 'char *', but argument 3 has type 'long int *' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32774 b3059339-0415-0410-9bf9-f77b7e298cf2 add missing fclose git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32775 b3059339-0415-0410-9bf9-f77b7e298cf2 add missing fclose() found by cppcheck: [avisubdump.c:199]: (error) Resource leak: f git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32776 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, vd_ffmpeg: Enable fflagarith video decodercehoyos2011-01-312-1/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: fix compilation on OS X 10.4.diego2011-01-311-0/+15
| | | | | | | | | This version is the last OS version available for certain classes of PPC Macs, but it lacks AudioDeviceIOProcID, so it has to be emulated. patch by Aaro Koskinen, aaro.koskinen iki fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32770 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/tech/codecs.conf.txt: add notes about BE/LE colorspacescompn2011-01-311-1/+5
| | | | | | Add some notes about BE/LE colorspaces and fix a small typo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32769 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add format id for FLAC in movcehoyos2011-01-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32767 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpdemux/mf.c: Don't hardcode filename lengthranma2011-01-311-2/+3
| | | | | | | | | Use limits.h to get the maximum length instead of hardcoding it. Original patch by Sang-Uok Kum. Signed-off-by: Tobias Diedrich <ranma@google.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32766 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Fix playback of ffv1 yuv422p16cehoyos2011-01-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32764 b3059339-0415-0410-9bf9-f77b7e298cf2
* osdep: tweak some #includesdiego2011-01-315-1/+6
| | | | | | Add/remove a few standard header #includes in osdep files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32762 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Define _XOPEN_SOURCE to 600 in mkstemp checkreimar2011-01-311-1/+1
| | | | | | | | | | Define _XOPEN_SOURCE to 600 instead of 500 in mkstemp check, this is consistent to the use in libavcodec, consistent with other _XOPEN_SOURCE defines in tests and it fixes detection on Solaris that refuses to compile system headers when combining std=c99 with _XOPEN_SOURCE 500. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32759 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: add define_statement_check functiondiego2011-01-311-73/+23
| | | | | | | | | | Add define_statement_check function and use it to simplify some checks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32758 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify a bunch of configure checks with the statement_check function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32760 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/tvi_v4l2.c: simplify by using getfps helper functionreimar2011-01-311-9/+2
| | | | | | | Use getfps helper function everywhere, simplifies code and avoids a possible division by 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32755 b3059339-0415-0410-9bf9-f77b7e298cf2
* example.conf: Disambiguate remarks about profilesdiego2011-01-311-15/+19
| | | | | | | Also move the profiles to the bottom of the example configuration file as the original remarks in the file suggested. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: define ROUND() macro in mpcommon.hcboesch2011-01-314-6/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32751 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: don't use old "--with-extralibdir" configure optiondiego2011-01-317-7/+7
| | | | | | | Replace mentions of obsolete '--with-extralibdir' configure option by '--extra-ldflags'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32748 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: simplify some testsdiego2011-01-311-53/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify vector declarations and fast inttypes check with statement_check(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32744 b3059339-0415-0410-9bf9-f77b7e298cf2 Drop unnecessary Xlib.h #include from Xss screensaver extensions check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32745 b3059339-0415-0410-9bf9-f77b7e298cf2 configure: Simplify *BSD ioctl_meteor.h check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32746 b3059339-0415-0410-9bf9-f77b7e298cf2 Add sys/time.h #include to videodev.h/videodev2.h checks. Older kernels had broken videodev* headers that lacked the required #include. patch by Michael Lampe, mlampe0 googlemail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32747 b3059339-0415-0410-9bf9-f77b7e298cf2 Revert previous wrong simplification of AltiVec vector declarations check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32749 b3059339-0415-0410-9bf9-f77b7e298cf2 cosmetics: Drop some unnecessary end-of-line backslashes after &&/||. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32752 b3059339-0415-0410-9bf9-f77b7e298cf2 cosmetics: Get rid of some backslashes at the end of lines. This is done by either moving the logical &&/|| operators to the preceding line or by merging the two lines together. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32753 b3059339-0415-0410-9bf9-f77b7e298cf2
* libfaad2:/ Remove forked internal libfaad2 copydiego2011-01-31116-62605/+7
| | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove AAC/FAAD2 installation instructions. There is nothing special about building and installing FAAD2, so there is no longer a need to keep maintaining instructions for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/tech/: remove several obsolete filesUoti Urpala2011-01-2917-2544/+0
| | | | | Some of the files contain some usable stuff, but overall they're obsolete enough that it's better to remove the current versions.
* loader: Remove __ptr32 and __ptr64 typedefsreimar2011-01-291-12/+0
| | | | | | | | We do not need them and they cause compilation errors with cygwin's mingw-w64 cross-compilers (32 bit target) since its _mingw.h has a "#define __ptr32", which makes these typedefs an invalid syntax. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32728 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: cygwin: don't rely on _WIN32 being definedreimar2011-01-292-3/+6
| | | | | | | | | | | | | | | configure: Compilation fixes for current Cygwin git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32724 b3059339-0415-0410-9bf9-f77b7e298cf2 Do not #define _WIN32 on the command line for Cygwin. Newer Cygwin versions no longer do this and hopefully we should be able to survive without this hack as well. This change necessitates adapting two #ifdefs in the MPlayer codebase. It is committed untested as I do not have access to a Cygwin system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32763 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: Replace two malloc+memset with calloc.cboesch2011-01-292-6/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32723 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: mark llvmpipe as a software rendererreimar2011-01-291-1/+2
| | | | | | | llvmpipe, while only slow instead of insanely slow, is a software renderer. Recognize it as such and disable -vo gl_nosw on it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32719 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 32699jrash2011-01-291-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32718 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream/http: support 307 (Temporary Redirect) responsescboesch2011-01-291-0/+2
| | | | | | Patch by chocolateboy (chocolateboy from cpan org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32717 b3059339-0415-0410-9bf9-f77b7e298cf2
* core: timing: fix overflow with extreme playback speedUoti Urpala2011-01-281-1/+5
| | | | | | | | With extreme playback speed changes it was possible to trigger an overflow in code calculating frame timing. This could break the VDPAU frame scheduling mechanism and lead to the shown picture not changing until reset by events such as seeking. Add an extra check to prevent the overflow.
* commands: improve playback speed property/commandsUoti Urpala2011-01-281-19/+15
| | | | | | | Add a definition to show the playback speed property on screen, and change the separate commands (speed_mult etc) to use the property mechanism. Now 'set_property_osd speed' can show the value on OSD, and the separate commands respect the range limits of the option.
* Merge branch 'sub'Uoti Urpala2011-01-2696-768/+1625
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sub: sub/OSD: move some related files to sub/ subtitles: options: enable -ass by default subtitles: change default libass rendering style demux_mkv, chapters: change millisecond arithmetic to ns cleanup: rename ass_* functions to mp_ass_* subs: use correct font aspect ratio for libass + converted subs cleanup: some random minor code simplification and cleanup vf_vo: fix EOSD change detection bug sd_ass: remove subreader use, support plaintext markup subtitles: style support for common SubRip tags and MicroDVD core: ordered chapters: fix bad subtitle parameter subs/demux: don't try to enable sub track when creating it subtitles/demux: store duration instead of endpts in demux packets subtitles: add framework for subtitle decoders options: add special -leak-report option subtitles: remove code trying to handle text subs with libavcodec cleanup: move MP_NOPTS_VALUE definition to mpcommon.h subtitles: move global ass_track to struct osd_state core: move most mpcommon.c contents to mplayer.c core: move global "subdata" and "vo_sub_last" to mpctx subtitles: remove sub_last_pts hack options: move -noconfig to option struct, simplify
| * sub/OSD: move some related files to sub/Uoti Urpala2011-01-2677-101/+97
| |
| * subtitles: options: enable -ass by defaultUoti Urpala2011-01-262-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are still some problems with -ass. For example some other subtitle options won't work the same way or at all with it enabled, and inserting the video filter for VOs that lack native rendering support won't work with different colorspaces. However I think that the benefit from styling support outweights those disadvantages, and also that the "discoverability" of features is better this way; it will be easier for people who encounter problems to find -noass than for people who see no styling to find out that they could add it with -ass. Enable -ass by default. Also fix other outdated information in the manpage entries for -ass and -fontconfig.
| * subtitles: change default libass rendering styleUoti Urpala2011-01-261-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default style used for rendering plaintext subtitles with libass. The following attributes change: * FontSize: Increase the size multiplier used with the default -subfont-autoscale 3 from 1.4 to 1.7, thus making the font 21% larger. Actually implementing the -subfont-autoscale modes other than 1 would give a multiplier of 5/3=1.67 for 4:3 aspect ratio video, sqrt(337)/9=2.04 for 16:9. * PrimaryColour: Change color from yellow to white. * Outline: Before this was 2 regardless of user font size choice. Make it FontSize/16 instead. With default font size this is about half the previous width. * Kerning: Enable kerning for the track. There won't be styling designed for VSFilter's lack of kerning, and hopefully people won't use broken fonts with bad kerning tables for the default font either.
| * demux_mkv, chapters: change millisecond arithmetic to nsUoti Urpala2011-01-264-45/+42
| | | | | | | | | | | | | | | | | | | | | | | | demux_mkv kept various integer timestamps in millisecond units. Matroska timestamp arithmetic is however specified in nanoseconds (even though files typically use 1 ms precision), and using ms units instead of that only made things more complex. Based on the demux_mkv example the general demuxer-level chapter structure also used ms units. Change the demux_mkv arithmetic and demuxer chapter structures to use nanoseconds instead. This also fixes a seeking problem in demux_mkv with files using a TimecodeScale other than the usual 1000000 (confusion between ms and TimecodeScale*ns units).
| * cleanup: rename ass_* functions to mp_ass_*Uoti Urpala2011-01-266-37/+38
| | | | | | | | | | | | | | | | The various ass_* functions were created when libass was part of the MPlayer tree and the distinction between MPlayer-specific and other functions was less clear. Now that libass is a clearly separate library, using the same ass_* namespace for player functions is ugly. Rename the functions to use mp_ass_ prefix instead.
| * subs: use correct font aspect ratio for libass + converted subsUoti Urpala2011-01-267-28/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rendering of ASS subtitles tries to be bug compatible with VSFilter and stretches fonts when the video is anamorphic (some scripts try to compensate for this VSFilter behavior, so trying to render them "correctly" would give the wrong result). However this behavior is not appropriate for subtitles we converted to ASS format ourselves for libass rendering, as they certainly don't have VSFilter bug workarounds. Change the code to use different behavior for "native" ASS tracks and converted ones. It's questionable whether the VSFilter-compatible behavior is appropriate for external .ass files either, as there could be anamorphic and non-anamorphic versions of the same video and the bug-compatible behavior can only be correct for one alternative at most. However it's probably better to keep it as a default at least, so that extracting a muxed subtitle track and using that does not give behavior different from the original muxed one. The aspect ratio setting is per ASS_Renderer, and changing it resets libass caches. For that reason this commit adds separate renderer instances to use for the "correct" and "VSFilter bug compatible" cases.
| * cleanup: some random minor code simplification and cleanupUoti Urpala2011-01-267-22/+19
| |
| * vf_vo: fix EOSD change detection bugUoti Urpala2011-01-181-1/+0
| | | | | | | | | | | | | | | | | | | | vf_vo had code setting its prev_visibility variable correctly, then a line that overrode the value just set with an incorrect one. Remove the wrong extra line. As a result of the bug the "contents changed" indicator wasn't forced to true when switching from a subtitle track to "no track" and then back. A visible effect was at least that a currently visible static subtitle disappeared when doing that switch back and forth.
| * sd_ass: remove subreader use, support plaintext markupUoti Urpala2011-01-183-14/+67
| | | | | | | | | | | | | | | | | | | | | | Originally, when rendering plaintext subs with libass, the subtitles were first converted to the "struct subtitle" form with sub_add_text() and then from that to libass events. Change sd_ass to convert the subtitles directly to libass events without using the old sub machinery. The new conversion at least fixes some timing issues. Also use the markup support added in the previous commit, so that HTML-style markup is also supported in "plaintext" subs rendered with libass.
| * subtitles: style support for common SubRip tags and MicroDVDUoti Urpala2011-01-186-21/+669
| | | | | | | | | | | | | | | | | | | | | | SubRip subtitles have no "official" spec for any styling support, but various tags are in common use; previous code filtered out text between <> to remove HTML-style tags. Add support for those tags and for MicroDVD subtitle styling. The style display is implemented by converting the subtitles to the ASS subtitle format and displaying them with libass, so libass needs to be enabled. Original patch by Clément Bœsch <ubitux@gmail.com>.
| * core: ordered chapters: fix bad subtitle parameterUoti Urpala2011-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | mp_property_do() takes the value to set a property to through a pointer. The calling code used '&mpctx->global_sub_pos' as the pointer; however that variable could be changed during the mp_property_do() call. Use a pointer to a copy of the original value instead. I think this only caused problems if you switched subtitle tracks from a real one to "disabled" and then switched to a timeline part from another source.
| * subs/demux: don't try to enable sub track when creating itUoti Urpala2011-01-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | demuxer.c new_sh_sub_sid() tried to immediately select the created sub track for playback if its id matched the "-sid" option value. This was buggy, as more initialization is needed to properly enable subtitles. Normally the correct track to play is selected after the demuxer has been created. It's possible that some DVD use case or such depended on the removed code to make -sid work with a subtitle track that's not found at start and only added later (vobsubs probably would start playing without separate initialization); if so then that needs to be fixed later in a different way.
| * subtitles/demux: store duration instead of endpts in demux packetsUoti Urpala2011-01-185-15/+18
| |
| * subtitles: add framework for subtitle decodersUoti Urpala2011-01-1810-55/+244
| | | | | | | | | | | | | | | | | | | | Add a framework for subtitle decoder modules that work more like audio/video decoders do, and change libass rendering of demuxed subtitles to use the new framework. The old subtitle code is messy, with details specific to handling particular subtitle types spread over high-level code. This should make it easier to clean things up and fix some bugs/limitations.
| * options: add special -leak-report optionUoti Urpala2011-01-153-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add a special option "-leak-report" that enables talloc lea