summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cache: allow STREAM_CTRL_GET_CURRENT_TIME with cachereimar2011-07-061-3/+12
| | | | | | | | | | | | | Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled. Due to that time being from what is currently read into the cache it is unfortunately somewhat inaccurate and unsmooth, however for streams that do have stream timestamps it is till a lot better than going by the demuxer alone. In particular it fixes bug #1081, when starting a DVD with -chapter following seeks would be relative to the start of the DVD instead of the current position. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33605 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: cache2.c: Fix commentreimar2011-07-061-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33600 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: stream_dvdnav.c: Remove pointless ()reimar2011-07-061-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33604 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_dvd: fix dvd_get_current_time()reimar2011-07-061-5/+5
| | | | | | Fix dvd_get_current_time so the cell argument actually has a purpose. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33603 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: vobsub.c: simplify parsingcboesch2011-07-061-57/+10
| | | | | | | | | | vobsub: simplify timestamp parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33601 b3059339-0415-0410-9bf9-f77b7e298cf2 vobsub: simplify origin parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33602 b3059339-0415-0410-9bf9-f77b7e298cf2
* dvdnav: make mp_dvdnav_save_smpi() more robustreimar2011-07-061-6/+10
| | | | | | | | | | Make mp_dvdnav_save_smpi more robust and ensure consistency of nav buffer. It seems that in_size could be negative sometimes, this would cause crashes if the malloc somehow succeeded. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33599 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: only set NEED_GLOB on Windowsreimar2011-07-061-2/+5
| | | | | | | | | Only set NEED_GLOB on Windows, as currently this has the effect of compiling win32-only code - and even if that compiled it would not be used anyway, since mf.c uses glob under "#if defined(HAVE_GLOB) || defined(__MINGW32__)". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33587 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_pvr: Replace <sys/fcntl.h> include by <fcntl.h>reimar2011-07-061-1/+1
| | | | | | | | Replace sys/fcntl.h include by fcntl.h include used everywhere else. Also fixes compilation with the Android NDK. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33584 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: when cross-compiling default host_cc to "cc"reimar2011-07-061-4/+5
| | | | | | | | | Set host_cc after cross-compile check. This allows to set "cc" as a more sensible, almost always working default when cross-compiling instead of using the cross-compiler as host-cc which is just nonsense. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33580 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Fix typoscehoyos2011-07-062-5/+5
| | | | | | Patch by Mike Castle, dalgoda+mplayer gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33575 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cdda: work around libcdparanoia caching issuesreimar2011-07-061-0/+3
| | | | | | | | | | | Constrain libcdparanoia's caching which badly breaks playback with -nocache (libcdparanoia requests a huge chunk at once, then lets the disk spin down while that is being played, leading to a pause when the disk needs to spin back up after the big chunk is finished). Switching to libcdio by default which does not have this ssue might be a better long-term solution though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33557 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream: show negative seek position value in error messagereimar2011-07-061-1/+2
| | | | | | | Make "Invalid seek to negative position" message more useful by printing the actual value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33556 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: fix _libcdio variable staying on "auto"reimar2011-07-061-0/+1
| | | | | | Fix _libcdio staying on "auto" if cdparanoia test succeeded before. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33555 b3059339-0415-0410-9bf9-f77b7e298cf2
* etc/mplayer.desktop: revise desktop fileib2011-07-061-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise desktop file. Split Name entry into Name and GenericName entries. This is according to the Desktop Entry Specification. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33540 b3059339-0415-0410-9bf9-f77b7e298cf2 Revise desktop file. Make slightly revised Catalan Name entry the GenericName entry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33541 b3059339-0415-0410-9bf9-f77b7e298cf2 Add German GenericName entry to desktop file and revise German Comment entry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33542 b3059339-0415-0410-9bf9-f77b7e298cf2 Make French and Italian Comment entries in desktop file GenericName entries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33543 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove Spanish and Chinese Comment entries from desktop file. There are no GenericName entries for Spanish and Chinese and it's uncertain whether the Comment entries are OK. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33544 b3059339-0415-0410-9bf9-f77b7e298cf2 Add X-GNOME-FullName entries to desktop file. According to the Desktop Entry Specification, the "full name" should be built from Name and GenericName. While some desktop environments do this (like KDE), GNOME doesn't and uses its own key instead. This closes Bugzilla #1680. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33545 b3059339-0415-0410-9bf9-f77b7e298cf2 Add Japanese entries to desktop file. Translation by committer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33546 b3059339-0415-0410-9bf9-f77b7e298cf2 Add Italian Comment entry to desktop file. Translation by Giorgio Vazzana, mywing81 gmail com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33547 b3059339-0415-0410-9bf9-f77b7e298cf2 Add French Comment entry to desktop file. Translation by Etienne Buira, etienne.buira free fr. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33548 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_ilpack: fix incompatible function typesreimar2011-07-061-5/+8
| | | | | | | | Do not call functions through a function pointer specifying more arguments. It is theoretically possible to have calling models where this would break horribly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33536 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: vf_ilpack.c: tabs to 4 spacesUoti Urpala2011-07-061-341/+341
|
* configure: add an initial check to verify compiler works at alliive2011-07-061-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33533 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_dint, vf_divtc: fix code assuming "char" is signedreimar2011-07-062-9/+9
| | | | | | | | | | | | | | | Use int as type, there is no reason to use char which also causes issues since it may be either signed or unsigned. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33529 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix code assuming that "char" is signed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33530 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix code incorrectly assuming "char" is signed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33531 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: x11_common: remove pointless GC operationsiive2011-07-061-3/+2
| | | | | | | | | | | | | | | Remove useless XSetBackground() call right before freeing the graphic context. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33524 b3059339-0415-0410-9bf9-f77b7e298cf2 Create empty vo_gc graphic context instead of one with undefined foreground color. The code that uses vo_gc already employs XSetForeground()/XSetBackground() to change the context accordingly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33525 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xv: avoid setting background color due to resize flickeriive2011-07-061-4/+5
| | | | | | | | | Set background color only when using ck-method=background. In the other cases clearing of the non-video image area should be done manually. Not drawing on the video image area prevents flickering (visible when resizing). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33522 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cue: Avoid probing empty filename in cue_find_bin()iive2011-07-061-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33521 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_cue: fix multiple bugsreimar2011-07-061-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spelling fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33510 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify: remove an unnecessary loop variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33511 b3059339-0415-0410-9bf9-f77b7e298cf2 Add some "const". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33512 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify NULL check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33513 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid crash if terminating " is missing. Part of patch by Ivan Kalvachev [ikalvachev gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33514 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix 0-termination being placed one byte too far. Part of patch by Ivan Kalvachev [ikalvachev gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33515 b3059339-0415-0410-9bf9-f77b7e298cf2 Ensure 0-termination even if line does not start with FILE " Part of patch by Ivan Kalvachev [ikalvachev gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33516 b3059339-0415-0410-9bf9-f77b7e298cf2 Only accept regular files as .bin files for .cue files. In particular avoids trying to use directories as .bin when e.g. we failed to extract a filename. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33517 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a duplicated open() call that could lead to a file-descriptor leak in some cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33518 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid possible crash if cue filename is very short. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33519 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify by using av_strlcpy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33520 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Support 9- and 10-bit YUV input for OpenGL VOsreimar2011-07-065-15/+46
| | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33502 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix clear/border color of chroma texture for 9- and 10-bit formats. Avoids pink borders for those formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33504 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: vo_direct3d: Mark a function staticdiego2011-07-061-2/+3
| | | | | | | This fixes the warning: libvo/vo_direct3d.c:984:6: warning: no previous prototype for 'vo_draw_alpha_l8a8' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33499 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_asf: Fix play duration calculation errorib2011-07-061-1/+1
| | | | | | | | | | Acording to the ASF documentation, the play duration is zero if the preroll value is greater than the play duration. The new way of determining it (suggested by reimar) prevents overflows as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33492 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_delogo: allow to change the rectangle based on the timecigaes2011-07-062-17/+134
| | | | | | | | | | NOTE: the memory for the "file" argument will be leaked; dynamic options are not automatically freed. Not fixing that now as I might implement more general handling later. -uau git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33488 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33498 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: vf_delogo.c: remove tabs to allow direct mergeUoti Urpala2011-07-061-57/+57
| | | | | Remove tab characters to make the file match MPlayer 1 and thus allow directly applying change from there.
* cosmetics: asf.h: Fix comment errorib2011-07-061-1/+1
| | | | | | | | According to the ASF documentation, MF_PD_ASF_FILEPROPERTIES_PREROLL (preroll) is UINT64. Fix type mentioned in comment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33484 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream dump: print progress informationcigaes2011-07-051-1/+55
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33478 b3059339-0415-0410-9bf9-f77b7e298cf2
* debug output: reduce verbosity of some frequent messagesUoti Urpala2011-07-052-6/+5
| | | | | Drop from frequent (per-frame) messages from DBG2 to DBG3. Drop VDPAU clock adjustment messages from V to DBG2.
* VO: silence "[ASPECT] Warning: No suitable new res found!"Uoti Urpala2011-07-051-1/+1
| | | | | | | | | | The warning "[ASPECT] Warning: No suitable new res found!" was printed from aspect() if the video ended up being downscaled from the original size AND the horizontal direction was the more limiting one for aspect-aware scaling. Also, because aspect() can run multiple times when starting playback this warning could be output multiple times. Change the code so that downscaling alone no longer triggers this message.
* VO: clean up aspect.c, remove aspecttest toolUoti Urpala2011-07-053-136/+44
| | | | | | | | | | Clean up aspect.c code and simplify it somewhat (without changing the overall logic). Replace debug output printf calls under #ifdef with mp_msg() debug output (somewhat modified). Remove the file aspecttest.c which created a binary to test aspect.c functionality. It did not compile and would not be particularly useful anyway. Remove some support lines from aspect.c and Makefile.
* OSD: when switching sub/audio tracks show title of new trackUoti Urpala2011-07-034-12/+33
| | | | | | If the played file has per-track titles for audio and subtitles show those on the OSD when switching tracks. This changes the OSD message from 'Audio: (2) eng' to 'Audio: (2) eng ("Director's commentary")'.
* commands: change property mechanism to use talloc stringsUoti Urpala2011-07-037-140/+91
|
* cosmetics: reformat demux_lavf.c, m_option.[ch] and m_property.cUoti Urpala2011-07-034-2710/+2905
|
* demux: use talloc for sh_* structs and "lang" fieldUoti Urpala2011-07-034-17/+16
|
* cleanup: reindent stheader.hUoti Urpala2011-07-031-100/+102
| | | | Also improve some comments and change two fields from int to bool.
* audio: move ready-for-ao data buffer from decoder to AOUoti Urpala2011-07-026-86/+77
| | | | | | | | | | | | Move the buffer storing audio data ready to be fed to the audio output driver from the audio decoder object to the AO object. This will help encoding code deal with end of input, and may also be useful to improve other general gapless audio behavior (as AOs which do not accept chunks smaller than a certain size may keep them in the buffer while the decoder changes). Less data may be dropped now when changing audio filters or switching timeline parts.
* Makefile: show brief build output by defaultClément Bœsch2011-07-021-0/+7
|
* Makefile: use $(RM) builtinClément Bœsch2011-07-021-21/+20
|
* cleanup: fix mp_dbg() format string warningsClément Bœsch2011-07-015-20/+11
|
* cleanup: mark some vo_directfb2.c and vo_s3fb.c functions staticUoti Urpala2011-06-292-12/+22
|
* Merge branch 'mplayer1_changes'Uoti Urpala2011-06-2932-108/+209
|\
| * subreader: SAMI subs: wrap line if neededreimar2011-06-291-0/+2
| | | | | | | | | | | | | | Start a new line if there's no space left to append to the previous one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add fourcc DVOO to rawyuy2cehoyos2011-06-291-0/+2
| | | | | | | | Digital Voodoo SD 8 Bit.
| * codecs.conf: add libavcodec r10k decodercehoyos2011-06-291-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33462 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_ts: Support S302M audiocehoyos2011-06-291-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33461 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codecs.conf: add S302M audio codec from libavcodeccehoyos2011-06-291-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33460 b3059339-0415-0410-9bf9-f77b7e298cf2
| * stream.c: make some stream messages translatableib2011-06-291-6/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33454 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_gl: Request GL_LUMINANCE16 for 16-bit YUV inputreimar2011-06-292-2/+5
| | | | | | | | | | | | | | Request GL_LUMINANCE16 as internal format for > 8 bit YUV formats. Have yet to find a system that actually provides that though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33453 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_gl: don't accept 9/10-bit formats as inputreimar2011-06-298-58/+74
| | | | | | | | | | | | | | | | | | Make mp_get_chroma_shift() simpler/more generic and add an argument to get the per-component bit depth. Use this to check more properly for supported formats in gl and gl2 vos (only 8 and 16 bit are supported, 9 and 10 are not). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33452 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Windows: stream_cddb.c: include <path.h> for MinGWvayne2011-06-291-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33449 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cleanup: Make vcd_seek_to_track() static in more filesreimar2011-06-294-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33436 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cache2.c: Avoid warnings about discarding volatilereimar2011-06-291-4/+10
| | | | | | | | | | | | | | | | | | In practice this should not really make a difference, but the code is not significantly worse and it is more correct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33435 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33447 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cleanup: some warning fixes and minor cleanupsreimar2011-06-295-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33399 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33400 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33421 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33425 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33426 b3059339-0415-0410-9bf9-f77b7e298cf2
| * input: support up to 20 mouse buttonsreimar2011-06-292-2/+42
| | | | | | | | | | | | | | Increase the number of supported mouse buttons from 10 to 20. There really seem to be input devices with at least 12. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33391 b3059339-0415-0410-9bf9-f77b7e298cf2
| * manpage: use upper case names for some keysib2011-06-291-4/+4
| | | | | | | | | | | | | | Change some key names to upper case and to match the names used in input.conf bindings. Most of them already were in this form. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33382 b3059339-0415-0410-9bf9-f77b7e298cf2
| * core: move m_config_free() last before exitreimar2011-06-291-5/+6
| | | | | | | | | | | | | | | | Move the call to m_config_free() to be the last thing done before exiting, otherwise mp_msg() might stop working if options it uses are freed/reset. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33380 b3059339-0415-0410-9bf9-f77b7e298cf2
<