summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30917Uoti Urpala2010-04-269-128/+102
|\
| * Rename libopencore AMR decoder entries.diego2010-03-171-2/+2
| | | | | | | | | | | | | | FFmpeg now has an AMR-NB decoder, this avoids name clashes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30917 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r22569 at least for some architectures.cehoyos2010-03-171-0/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30916 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Drop leading underscores from arch variables.diego2010-03-171-40/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30915 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Follow a more proper way to support -codecpath.komh2010-03-175-6/+17
| | | | | | | | | | | | | | | | | | | | 1. Include loader/drv.h for SetCodecPath() instead of a declaration of it. 2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix return value of InitializeCriticalSectionAndSpinCount.sesse2010-03-161-1/+2
| | | | | | | | | | | | | | | | | | InitializeCriticalSectionAndSpinCount returns a nonzero value on success, and some codecs (notably VP7) seemingly got confused when it didn't, if and only if we tried to emulate NT or newer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30913 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable, fixes the warning:diego2010-03-161-1/+0
| | | | | | | | | | | | | | libmpcodecs/vd_qtvideo.c:242: warning: unused variable 'result' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30912 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix libmpcodecs/vd_qtvideo.c compilation on OS X:sesse2010-03-161-6/+3
| | | | | | | | | | | | | | | | - Declare the "result" variable even for native QuickTime. - ExitMovies returns void; don't check its result value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30911 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some commented-out debugging and similar cruft.diego2010-03-161-45/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30910 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary forward declarations for a bunch of functions.diego2010-03-161-21/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30909 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r30908Uoti Urpala2010-04-261-156/+156
|\|
| * cosmetics: Move all functions before main().diego2010-03-161-149/+161
| | | | | | | | | | | | | | This will help avoid some forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30908 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30907Uoti Urpala2010-04-2622-443/+478
|\|
| * Remove disabled flip_upside_down function; it has been unused for ages.diego2010-03-161-23/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30907 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary forward declaration of print_wave_header().diego2010-03-161-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30906 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r22565.cehoyos2010-03-161-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30905 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Calculate width and height in mp4_header_process_vop().cehoyos2010-03-152-0/+9
| | | | | | | | | | | | | | Fixes elementary streams with -vc ffodivxvdpau and the native demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30904 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix value of bit counter at end of functions to prepare for future patches.cehoyos2010-03-151-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30903 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix indentation in GetVersionExW.sesse2010-03-151-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30902 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for Apple's ProRes and AIC codecs, now that all prerequisitessesse2010-03-152-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are in place. Add codecs.conf entry for both codecs, and qt_comp.h entry for ProRes (not used except for debugging, so mainly for completeness). Both work with -demuxer mov only, as all other QuickTime binary codecs. AIC support is for OS X only, and untested. Split out from a patch Andrew Wason (r e c t a l o g i c <at> rectalogic <dot> com) posted in June. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30901 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement GetVersionExW with the same data as GetVersionExA but taking in asesse2010-03-151-0/+67
| | | | | | | | | | | | | | | | different structure, and CreateMutexW, CreateEventW and CreateSemaphoreW as simple wrappers around the A versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30900 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the high-level QuickTime decoding APIs (DecompressSequenceFrameS andsesse2010-03-152-224/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | friends) instead of the unsupported, internal ones (ImageCodecBeginBand etc.). This is a prerequisite for, among others, Apple ProRes 4:2:2 support, and simplifies the file by quite a bit. Tested on Linux with all existing QuickTime codecs I could get to work in the first place; qt261, qtavui, qtsvq3 have no change. qtcvid appears to not give bit-exact the same output as before, but it looks just the same in playback to me. qt3ivx stops crashing on exit (so works better than before). With some extra patches and a codecs.conf entry, ProRes 4:2:2 also works, including on Linux. Since codec initialization is now actually done on decoder init instead of on first frame, fallback should also work a bit better (although usually, qtvideo is last in the chain). Also made the decoder complain explicitly if the demuxer data is not there (ie., the user tried to run without -demuxer mov). This patch is a cleaned up version of what Andrew Wason (rectalogic A rectalogic D com) posted to mplayer-dev-eng in June. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30899 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Relocate -codecpath description in alphabetical order.komh2010-03-151-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30898 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -codecpath option.komh2010-03-155-0/+23
| | | | | | | | | | | | | | | | It allows to search binary codecs in non-standard directories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30897 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add CONFIG_DCT and CONFIG_DWT to config.h as well as to config.mak for FFmpeg.diego2010-03-151-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30896 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless tmppath variable in set_path_env().diego2010-03-141-5/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30895 b3059339-0415-0410-9bf9-f77b7e298cf2
| * variable renaming cosmetics: _have_yasm --> have_yasmdiego2010-03-141-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30894 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused MMX_FFT Makefile variable.diego2010-03-141-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30893 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Simplify _codecsdir setting for MinGW and OS/2.diego2010-03-141-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30892 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -Wstrict-prototypes to CFLAGS.diego2010-03-141-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30891 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use menu instead of GUI as example for an internal feature turned on by a flag.diego2010-03-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30890 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r22522.cehoyos2010-03-141-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30889 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace separate Win32, XAnim and Real codec directories by one global dir.diego2010-03-147-55/+17
| | | | | | | | | | | | | | | | | | Nowadays MPlayer does not use the codecs from other installed programs. A runtime setting will soon take over the rare case that binary codecs should be searched for in non-standard directories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30888 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fftheora supports 4:2:2 and 4:4:4 nowconrad2010-03-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30887 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 rev. 30868jrash2010-03-131-1/+82
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30886 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add the 0xA109 format for speex, it is claimed to be officially registered (havereimar2010-03-121-0/+1
| | | | | | | | | | | | | | not verified). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30885 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support extradata format of the speex.acm windows codec formerly availablereimar2010-03-121-0/+24
| | | | | | | | | | | | | | from openacm.org. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30884 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix crash if speex_packet_to_header fails.reimar2010-03-121-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30883 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add newlines to generated fragment program to make both fragment program dumpreimar2010-03-121-117/+117
| | | | | | | | | | | | | | with -v more readable and compiler error message more understandable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30882 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Include libavutil/avutil.h for FFMINkomh2010-03-101-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30881 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Include osdep/osdep.h instead of checking a platfrom specific macro to includekomh2010-03-101-3/+2
| | | | | | | | | | | | | | a platform specific header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30880 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: track current chapter for relative chapter seeksUoti Urpala2010-04-252-4/+25
| | | | | | | | | | | | | | | | | | | | Due to inexact seeks, chapter seek commands may result in a playback position that's inside the previous chapter. This causes problems when the user does repeated next-chapter/previous-chapter seeks, because the code will use the wrong base for calculating 'next' or 'previous'. Improve the behavior by adding a heuristic that keeps track of what chapter the user last wanted to seek to and adjusts the "current chapter" value based on that.
* | mplayer.c: silence some compiler warningsUoti Urpala2010-04-251-3/+5
| | | | | | | | No semantic changes.
* | cfg-mplayer.h: add casts to silence warningsUoti Urpala2010-04-251-3/+3
| |
* | mplayer.h: remove unnecessary declarations (dvd_device, cdrom_device)Uoti Urpala2010-04-251-3/+0
| |
* | cosmetics: mark sub.c:osd_update_ext() staticUoti Urpala2010-04-251-3/+3
| |
* | commands: finish seeks before processing other commandsUoti Urpala2010-04-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code processing seek commands only sets/alters variables specifying the current seek target. Before all queued commands were processed first, and any needed seeks were executed after that. This was somewhat unreliable, as commands queued later were not guaranteed to see all the effects of earlier seek commands if they happened to be processed in the same batch. Change the behavior so that processing commands is interrupted and the real seek executed if the next command is anything other than a basic seek. This guarantees that other commands see a consistent state, while still allowing the combining of consecutive seeks (which is useful for example when the user keeps the seek-forward key pressed down, and key repeat is faster than seeks can be executed).
* | 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 handle