summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* input: accept Shift modifier for Enter and Tab keysUoti Urpala2011-02-051-1/+2
| | | | | | Enter and Tab are the only named keys (rather than identified by the printable character they produce) with code below 256. Add a special case to recognize the Shift modifier with them.
* input: remove incorrect "CTRL" keyname alias for backspaceUoti Urpala2011-02-051-1/+0
| | | | | | | | | | | The keycodes.h file contains a KEY_CTRL define, then various control keys expressed as "KEY_CTRL + 0" and so on. Back in 2002 when the key name table in input.c was created this KEY_CTRL define was mistakenly interpreted as a key name, apparently confusing it with the Ctrl key (even though the input system didn't handle that key back then). As a result there was an incorrect key name entry with the same key code as backspace and name "CTRL". This incorrect entry was used when printing the name of the key. Delete it.
* x11_common: fix for reconfig with pos/xineramascreen setUoti Urpala2011-02-032-9/+9
| | | | | | | | | | | | | vo_x11_create_vo_window() only called vo_x11_update_geometry() if no window position had been specified by -geometry or -xineramascreen, to avoid overwriting the specified position with values from the existing window. However window size should be initialized to the existing window here, and setting new window title for -use-filename-title is also done in vo_x11_update_geometry() (for whatever reason, it doesn't match what else that function does). Change the code in vo_x11_create_vo_window() to always call vo_x11_update_geometry() for size variable and window title updates, but add a flag that tells it not to update position variables.
* af_lavcac3enc: fix for lavc AC-3 encoder change to float inputUoti Urpala2011-02-031-5/+26
| | | | | | | | | | | | | | | | The libavcodec AC-3 encoder was changed to use floats, and take floating point samples as input (the fixed-point version is still available under the new name "ac3_fixed"). This broke af_lavcac3enc because it blindly assumed without checking that the "ac3" encoder would take signed 16-bit integer samples. Improve af_lavcac3enc so that it checks the sample formats supported by the encoder and can handle either int16_t or float. Perhaps an option to keep using integer input but instead switch the encoder name to "ac3_fixed" for new libavcodec versions would have some value. Then again, maybe not. Using the preferred data format of the default "ac3" encoder should normally be best, so probably better not add such an option unless real need appears.
* ad_ffmpeg: add missing extradata paddingUoti Urpala2011-02-021-1/+2
| | | | | | One of two alternative code parts passing codec extradata to libavcodec didn't add the buffer padding that libavcodec requires, resulting in invalid reads beoynd allocated memory area. Fix.
* configure: print "Unknown parameter: " error to stderrUoti Urpala2011-02-021-1/+1
| | | | | Print the "Unknown parameter: " line shown for unrecognized configure options to stderr; other fatal errors are already directed there.
* configure: drop unused liblzo and bzlib testsUoti Urpala2011-02-021-35/+0
| | | | | The configure liblzo test was left over from MEncoder functionality, bzlib from internal FFmpeg build. Remove both.
* configure: prefer libvorbis to libvorbisidec/tremorUoti Urpala2011-02-011-6/+6
| | | | | | | | libvorbis and libvorbisidec cannot both be enabled at the same time. Change configure to enable libvorbis by default if both are available. It's the more common library, and if someone want to do a special build for FPU-less systems he can select the library manually.
* tremor: drop internal tremor libraryUoti Urpala2011-02-0137-9779/+3
| | | | | | | Drop internal copy of the tremor library. Note that the internal ogg demuxer (which is still sometimes useful to work around libavformat ogg demuxer problems, though it's itself quite buggy) now cannot be compiled without either external libvorbis or libvorbisidec (tremor).
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-0131-13963/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* Copyright: delete removed library copies from listUoti Urpala2011-02-011-46/+4
|
* terminal output: change infamous "Core dumped" messageUoti Urpala2011-02-011-2/+2
| | | | | | The "Core dumped ;)" message printed after finishing a stream dump is known to confuse users but was kept as "humor". Change it to say "Stream dump complete." instead.
* manpage: remove BUGS section, misc fixesUoti Urpala2011-02-011-22/+4
| | | | | | | About the only useful part of the BUGS section on the manpage was a link to mplayerhq.hu, and that doesn't really apply any more (includes references to Subversion etc). Remove that section and update/remove some outdated info.
* options: remove CONF_OLD option flagUoti Urpala2011-01-313-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resulting semantics of this flag are weird enough that they're unlikely to be what is wanted in any situation. Remove the flag and convert the two options using it, -screenw and -screenh, to use CONF_NOSAVE instead. I'm not sure why those specific options had the flag and if any flag is really needed, but I don't want to check in detail now and using CONF_NOSAVE should keep about the same behavior in practice. A bit more detail about the weird behavior this flag had: When not using file groups, the flag had the same behavior as CONF_NOSAVE, namely that when switching files the option would not be reset to the global value (only possible file-specific settings were applied). When using file groups, group-specific options would apply to the _first two_ files in the group, but for the rest after the first two, settings would not be reset when changing files (wtf?). This was a result of the following sequence: 1) push higher-level settings, enter group 2) apply group-specific settings 3) push settings before applying ones specific to file 1 in group 4) apply file 1 settings, play file 1 5) pop settings to return to group settings 6) push settings before applying ones specific to file 2 7) apply file 2 settings 8) pop settings Here the option was set at 2). 3) saved it because it had been set after last push, so 5) restored the setting and it was used for file 2 too. However 6) no longer saved it because there had been pushes after the original setting in 2), thus 8) no longer restored the setting and the option was no longer forced to any particular value when playing further files after that.
* options: mark -fs with CONF_NOSAVE to keep state between filesUoti Urpala2011-01-311-1/+1
| | | | | | | | | | | Most of the time users want to keep current fullscreen state when switching to another file, rather than always resetting to the global default that was determined when the command line was parsed. Add the CONF_NOSAVE flag to the -fs option to achieve this. The change means that the fullscreen state from the previous file is kept unless there is an explicit file-specific -fs or -nofs setting for the new file (or in case file groups are used, moving to the new file enters a group with explicitly specified state).
* options: remove unused "func_full" option typeUoti Urpala2011-01-313-43/+2
| | | | | | vo_zr was the last user of the "func_full" option type. I think it's better if future features are implemented using more straightforward option functionality. Delete the func_full implementation.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-3116-3455/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-318-1326/+1
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | |