summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* input: remove unused "paused" arguments from some functionsUoti Urpala2010-04-254-24/+24
|
* menu.h: add struct tag declaration to avoid warningsUoti Urpala2010-04-251-0/+1
|
* Fix chapter handling with first chapter not at beginning of fileUoti Urpala2010-04-253-4/+5
| | | | | | | | | | Before "-chapter 1" did nothing even if the first chapter didn't start at the beginning of file. Fix it. Before all chapter property commands (including chapter seek keys) failed if the current playback position was before the start of the first chapter. Now they'll work. Relative chapter seeks will go to the first chapter (even if that's in the wrong direction for backward seeks).
* demux_mkv: fix verbose output of chapter numberingUoti Urpala2010-04-251-1/+1
| | | | The "Chapter N from..." lines printed with -v used wrong N.
* Fix -chapter with ordered chaptersUoti Urpala2010-04-251-6/+6
| | | | | Move the code doing an initial seek specified by -chapter to a position where it works if ordered chapters are used.
* options: move -chapter values to option structUoti Urpala2010-04-2512-60/+69
| | | | | | | | | | | -chapter can optionally take a range with a start and an end. Add a new option type which supports such values and use that instead of a custom per-option function. This commit also fixes a build configuration bug: before the availability of the -chapter option depended on DVD functionality being enabled in the binary, even though the option works with other sources too.
* mplayer.c: share seek-reset code with chapter seeksUoti Urpala2010-04-251-53/+51
| | | | | | | Move code resetting various things after a seek into a separate function and use that for chapter seeks too. In most cases this won't change behavior because chapter seeks were already falling back to the same time-based seek code.
* demux_lavf, stream_ffmpeg: support librtmp seeksUoti Urpala2010-04-232-5/+31
|
* stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streamsUoti Urpala2010-04-233-5/+15
| | | | | | | | | | Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting generic format probing handle this could work, but with the current probing implementation it'd at least depend on not-really-guaranteed details of the stream layer (probing different formats and then decoding depends on seeking back in between; rtmp streams don't support such seeking directly so would need to rely on details of caching behavior).
* options: move lavfdopts to option structUoti Urpala2010-04-232-27/+37
|
* stream_ffmpeg.c: change reads back to url_read_complete()Uoti Urpala2010-04-231-1/+1
| | | | | | | | Change reading data from FFmpeg from url_read() back to url_read_complete(). url_read_complete() behavior has changed in FFmpeg and no longer returns an error for partial reads at EOF so it's usable now. Using it is probably not significantly better than url_read(), but at least it handles EAGAIN.
* demuxer.c: clean up stream-seek codeUoti Urpala2010-04-231-22/+29
| | | | | | | | | Only try to use the dvd/dvdnav stream seek hack with those stream types. Generally demuxers can not be expected to cope with the stream suddenly seeking under them. In principle it would be more correct to make the test demuxer-based (instead of assuming that using stream seeks in this manner is OK with whatever demuxer that will be used with these streams), but that'd be more work.
* Move some sh_audio field setting out of demuxer.cUoti Urpala2010-04-232-3/+4
| | | | These fields are decoder details, not information set by the demuxer.
* Move seek-reset functionality out of demuxer.cUoti Urpala2010-04-233-40/+29
| | | | | | | Move code for resetting decoders after seeks, chapter seeks and angle changes out of demuxer.c. This functionality belongs on a higher level; the demux layer can't always know what kind of reinitialization is required.
* build: create and install .mo translation filesUoti Urpala2010-04-013-8/+56
| | | | | | | | | | | | | | | | | | If --enable-translation was specified to configure, build and install .mo files for the selected message language(s). The languages enabled can be chosen with the --language-msg option; by default all available ones will be installed. The .po source files for available languages are seached under the po/ subdirectory; at the moment that subdirectory is not included in the sources so no languages will be enabled unless you add the actual translations before running configure. The .mo files are created in the locale/ subdirectory when compiling. By default MPlayer will only look for them in the installed location, so the newly compiled .mo files will not be found if you run MPlayer without installing. You can set the MPLAYER_LOCALEDIR environment variable to point to the locale/ directory to test the translations without installing.
* ad_ffmpeg: prefer codec to container samplerate for ffaacUoti Urpala2010-03-211-1/+6
| | | | | | Container-level information can be unreliable for AAC because of SBR handling problems, so use the samplerate value from the codec instead.
* demux_mkv: Fix problem with compressed subtitle private dataUoti Urpala2010-03-211-10/+12
| | | | | | | Convert demux_mkv_decode() to allocate possible new storage with talloc and fix a talloc/malloc conflict in demux_mkv_open_sub() that broke decoding of files which had a subtitle track with compressed private data.
* TOOLS/matroska.py: support 8-byte floats in parsing modeUoti Urpala2010-03-111-2/+7
| | | | | Support parsing and printing the value of 8-byte floats when using the script to parse and display contents of Matroska files.
* Makefile: fix %.S rule (broke loader build on x86)Uoti Urpala2010-03-101-1/+1
| | | | | The rule merged from svn used "ASFLAGS" which was set for FFmpeg only. Change it to use CFLAGS instead (ASFLAGS is the same in svn).
* Delete things related to old translation systemUoti Urpala2010-03-10220-34479/+6
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Merge svn changes up to r30879Uoti Urpala2010-03-101-2/+3
|\
| * Return MP_NOPTS_VALUE if we can't figure out the pts, not 0.reimar2010-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30879 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve handling of 0-size ogg packets.reimar2010-03-091-1/+2
| | | | | | | | | | | | | | Fixes bug 1664. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30878 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30877Uoti Urpala2010-03-100-0/+0
|\|
| * unbreak compilation after cleanups in libavutil/common.hsiretart2010-03-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30877 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30876Uoti Urpala2010-03-1026-90/+828
|\|
| * Fix alpabetical order.cehoyos2010-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30876 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support SEGA CRI adx codec with demuxer lavf.cehoyos2010-03-092-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30875 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix a syntax error in graph.h.sesse2010-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30874 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add copyright headers.sesse2010-03-092-0/+37
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30873 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Style changes as requested by Diego.sesse2010-03-092-38/+37
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30872 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix help text for --disable-win32dll.cehoyos2010-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30871 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Commit files by Steinar Gunderson, forgotten in r30866.cehoyos2010-03-092-0/+184
| | | | | | | | | | | | | | Fixes compilation on x86-32. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30870 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation on powerpc with --disable-altivecsiretart2010-03-091-2/+2
| | | | | | | | | | | | | | | | | | in case altivec is disabled, even compilation of code using altivec keywords or asm must be avoided. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30869 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document x264 VUI options.corey2010-03-091-0/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30868 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a note about what x264's 'aud' parameter is for.corey2010-03-091-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30867 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement DirectShow filter graph.sesse2010-03-086-4/+46
| | | | | | | | | | | | | | | | | | | | DirectShow specifies that a filter (codec) can expect JoinFilterGraph to be called, and store a reference to the graph manager. Implement a very bare-bones graph manager (all functions are stubs, and no extra interfaces are implemented) and give it to the codec on init. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30866 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Correct QuickTime dpi output.sesse2010-03-081-2/+2
| | | | | | | | | | | | | | | | The dpi value for QuickTime codecs is stored as Fixed16 (16.16 fixed-point), not int. Correct the output value accordingly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30865 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check for allocation failure for c->lumMmx2FilterCode and c->chrMmx2FilterCode.reimar2010-03-081-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30864 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix memleak due to incorrect VirtualFree arguments: size must be 0 for ↵reimar2010-03-081-2/+2
| | | | | | | | | | | | MEM_RELEASE. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30863 b3059339-0415-0410-9bf9-f77b7e298cf2
| * We have some sort of DVD menu support nowadays.diego2010-03-081-8/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30862 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement ResumeThread and SignalObjectAndWait.sesse2010-03-081-0/+31
| | | | | | | | | | | | | | | | | | Relatively simplistic implementations of ResumeThread (stub) and SignalObjectAndWait (bAlertable is ignored). Both are needed for ProRes 4:2:2 support on Linux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30861 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Increase mplayer buffer padding size to match the new one from ffmpeg.iive2010-03-071-1/+1
| | | | | | | | | | | | | | Allows compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30860 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use FBIOPAN_DISPLAY for switching between pages, seems to work for morereimar2010-03-071-1/+1
| | | | | | | | | | | | | | drivers and can be much faster. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30859 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add double-buffering support to vo_fbdev.reimar2010-03-071-3/+35
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30858 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use int64_t instead of long for variable containing current playback time.reimar2010-03-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30857 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplication of usePal() macro.stefano2010-03-063-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30856 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support to BGR444/RGB444 foreign endian output in libswscale.stefano2010-03-062-4/+12
| | | | | | | | | | | | Patch by Janusz Krzysztofik |jkrzyszt ^ tis icnet pl|. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30855 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix QuickTime emulated OSErr type.sesse2010-03-063-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | The OSErr type on Mac OS X is int16_t, not int32_t (see http://developer.apple.com/mac/library/documentation/QuickTime/Reference/QTRef_DataTypes/Reference/reference.html). The upper 16 bits will typically be something random (they're entirely undefined). Change the type so it's right; a few places tried to compensate for this by masking out the upper bits, but a few places also missed them, which made for unpredictable behavior. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30854 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement Win32 mutexes.sesse2010-03-061-27/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Win32 mutexes; they used to just be mapped on top of events, which is not the same thing at all. The implementation is pretty much the obvious one, similar to the current critical section implementation and the semaphore implementation; a single lock count protected by a pthread mutex, and an event lockers can sleep on to know when the mutex is available. Also make CreateMutexA and ReleaseMutex available even if QuickTime codecs support is not configured. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30853 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix semaphore behavior in WaitForSingleObject.sesse2010-03-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Two simple bugfixes for semaphores in WaitForSingleObject: First, semaphore count should be decreased on loading the semaphore, not increased. The case for duration=0 had this wrong (duration=-1 was fine). Second, the code for duration=-1 forgot to set the return value, so it would always return WAIT_FAILED. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30852 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make Win32 mutex and thread linked lists thread safe.sesse2010-03-061-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | loader/win32.c contains a global linked list of all existing mutexes (whose head is called mlist), which is accessed from multiple threads, and as such needs to be protected by a mutex. Fixed. Same thing for the global linked list of all existing threads, whose head is called list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30851 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Define O_BINARY in stream/stream.h unless it is defined yet, and use itkomh2010-03-064-10/+5
| | | | | | | | | | | | | | | | | | | | | | in other places. This removes platform specific checks and prevents repeated definitions of O_BINARY. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30850 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable ASS/SSA subtitle support in mencodergreg2010-03-055-20/+291
| | | | | | | | | | | | | | | | | | | | | | Enable ASS/SSA rendering through libass in mencoder. This duplicates a bit of code (to parse font attachments, for example). Additionally, add a filter "fixpts" that generates PTS, simulating fixed fps. PTS generated by this filter are then used for subtitle timing. Original patch by Nicolas George. (nicolas.george normalesup.org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30848Uoti Urpala2010-03-1023-553/+457
|\|
| * Make GetModuleHandle(NULL) return a valid pointer.sesse2010-03-051-5/+19
| | | | | | | | | | | | | | | | | | | | | | Some codecs, and more recently Microsoft's CRT library, expect GetModuleHandle(NULL) to return a pointer to the program's PE header mapped in memory. Thus, just returning 0x0 or 0x1 won't do it anymore, so create a minimal PE header and return that. Patch originally by Gianluigi Tiesi ( mplayer (at) netfarm (dot) it ). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30848 b3059339-0415-0410-9bf9-f77b7e298cf2
| * try to avoid returning odd slices.michael2010-03-051-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30847 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse fb_tty_fd for setting up the text area.reimar2010-03-051-11/+5
| | | | | | | | | | | | | | | | This avoids the fopen call which could end up creating a /dev/tty file if it did not exist. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30846 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 rev. 30822jrash2010-03-051-8/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30845 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Partial revert of r30843.sesse2010-03-051-17/+5
| | | | | | | | | | | | | | | | | | Some extra changes snuck into my commit; they'll probably be reviewed and committed to Subversion eventually, but were not part of the fix for WaitForSingleObject on thread handles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30844 b3059339-0415-0410-9bf9-f77b7e298cf2
| *