summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30529Uoti Urpala2010-03-0911-67/+114
|\
| * There is Indeo 5 decoder in FFmpeg now, so register itkostya2010-02-091-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30529 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix linking of mp3lib test programs when internal mp3lib is disabled.diego2010-02-081-2/+4
| | | | | | | | | | | | | | Dependencies were only set correctly if internal mp3lib was enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30528 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix linking of liba52 test program when internal liba52 is disabled.diego2010-02-081-2/+4
| | | | | | | | | | | | | | Dependencies were only set correctly if internal liba52 was enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30527 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove disabled AVIFILE-specific preprocessor code.diego2010-02-081-9/+0
| | | | | | | | | | | | | | It will never get enabled in MPlayer, nor is it more than cruft. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30526 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge some preprocessor conditionals where appropriate.diego2010-02-081-12/+4
| | | | | | | | | | | | | | This saves a few lines and simplifies the code slightly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30525 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix subtitle display for DVDs using fade-in/fade-out.reimar2010-02-061-5/+17
| | | | | | | | | | | | | | | | This does not do the actual fading, this is not supported by MPlayer, but will just use the highest alpha value used during display. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30524 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make mkalpha function simpler, faster and more correct.reimar2010-02-061-8/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30523 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with r30515Gabrov2010-02-063-14/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30522 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r30436jrash2010-02-061-11/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30521 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify how usesVFilter and usesHFilter are set.stefano2010-02-051-9/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30520 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Apply misc fixes to sws_getCoefficients() doxy.stefano2010-02-051-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30519 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Satisfy consistency need:stefano2010-02-051-1/+1
| | | | | | | | | | | | | | int * sws_getCoefficients -> int *sws_getCoefficients. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30518 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Prefer libavformat over our own mov demuxer also for video/quicktimereimar2010-02-051-4/+5
| | | | | | | | | | | | | | mime-type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30517 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Release pin enumerator after we are done using it.reimar2010-02-051-0/+1
| | | | | | | | | | | | | | | | Fixes issues with CoreAVC tray icon. Patch by Gianluigi Tiesi [mplayer netfarm it] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30516 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30515Uoti Urpala2010-03-090-0/+0
|\| | | | | | | | | Incompatible and inferior version of stream support for external libass subs.
| * Add support for loading ASS subtitles through the stream layer and thus e.g.reimar2010-02-0514-13/+61
| | | | | | | | | | | | | | | | from some network location. Patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30515 b3059339-0415-0410-9bf9-f77b7e298cf2
* | subs: support loading external ASS subtitles via stream layerUoti Urpala2010-03-093-2/+55
| | | | | | | | | | | | | | | | | | Previously the argument of the "-sub" option was always interpreted as a local filename when trying to read it as a libass file. Use the stream layer to read it instead, so that protocols like 'http://' are also supported like they are for the main video/audio file. Based on patch by Yuriy Kaminskiy <yumkam@mail.ru>
* | Merge svn changes up to r30514Uoti Urpala2010-03-097-58/+74
|\|
| * Fix hang with -fixed-vo due to VOFLAG_HIDDEN never being removed from ↵reimar2010-02-051-0/+1
| | | | | | | | | | | | window_state. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30514 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add function to translate SWS_CS_* to coefficient arrayconrad2010-02-052-1/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30513 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Prefix EXTERN_ASM to global variables to match them to an extern prefix of C.komh2010-02-051-22/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30512 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove '.section' causing the following assembler error on OS/2.komh2010-02-051-2/+2
| | | | | | | | | | | | | | Error: unknown pseudo-op: `.section' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30511 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print messages only after we are sure preinit will not fail anymore.reimar2010-02-051-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30510 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for VOFLAG_HIDDEN to the w32 backend.reimar2010-02-041-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set the PixelFormat right after creating the window and set it only once.reimar2010-02-041-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30508 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create the OpenGL probe window as a hidden Window on X11.reimar2010-02-043-3/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30507 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mention rtmp and rtsp specifically as formats supported via ffmpeg.reimar2010-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30506 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30505Uoti Urpala2010-03-090-0/+0
|\|
| * Enable RTSP and SDP demuxers if network support is enabled, they can now be ↵reimar2010-02-041-1/+2
| | | | | | | | | | | | used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30505 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l: Fix compilation (broken by me).cehoyos2010-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30504 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Clarify -vo vdpau:pullupcehoyos2010-02-042-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30502Uoti Urpala2010-03-095-16/+26
|\| | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
| * Audio buffer is too large so that it takes too long time to respond to audiokomh2010-02-041-1/+1
| | | | | | | | | | | | | | control such as software volume control. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30502 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement shuffle_bytes_abcd() functions and use them for shufflingstefano2010-02-033-6/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | bytes when converting between RGB32 variants. In particular fix the argb -> rgba and abgr -> bgra conversions. See the thread: Subject: [FFmpeg-devel] [RFC] RGB32 / BGR32 ethernal bug Date: Tue, 26 Jan 2010 01:06:18 +0100 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30501 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace incorrect usage of strncpy.reimar2010-02-031-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindentreimar2010-02-032-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.reimar2010-02-032-7/+16
| | | | | | | | | | | | | | ffmpeg://rtsp://... will play a rtsp stream via FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use vo_x11_clearwindow instead of XClearWindow, both for consistency and alsoreimar2010-02-031-1/+1
| | | | | | | | | | | | | | | | because vo_x11_clearwindow works as intended also when the background is set to None. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30497 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix argument order for lseek, fixes cookie loading in Windows and in generalreimar2010-02-031-1/+1
| | | | | | | | | | | | | | everywhere where SEEK_SET != 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30496 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30495Uoti Urpala2010-03-090-0/+0
|\| | | | | | | FFmpeg build stuff.
| * Checks ipv6_mreq/sockaddr_in6/sockaddr_sa_len for FFmpegkomh2010-02-031-2/+48
| | | | | | | | | | | | | | | | instead of defining macros unconditionally. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30495 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30494Uoti Urpala2010-03-099-36/+122
|\| | | | | | | | | | | Conflicts: libvo/vo_gl.c libvo/x11_common.c
| * Add missing license headers to test programs for external libraries.diego2010-02-034-2/+72
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30494 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a duplicated vo_x11_sizehint, vo_x11_nofs_sizepos already calls thisreimar2010-02-021-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30493 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless initializers and also set geometry_*_changed to 0 whenreimar2010-02-021-7/+5
| | | | | | | | | | | | | | | | -geometry did not adjust some values (instead of only ever setting them to 1 and never reset them). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30492 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mention yuv=2 auto-detection in Changelog.reimar2010-02-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30491 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document auto-detection of -vo gl:yuv=... value.reimar2010-02-021-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30490 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for autodetection during preinit and use that to detect a defaultreimar2010-02-021-22/+42
| | | | | | | | | | | | | | value for the yuv suboption. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30489 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid using options before autodetectGlExtensions to allow it to change them ↵reimar2010-02-021-5/+3
| | | | | | | | | | | | properly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30488 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove vo_config_count check from uninit, it should always be safe to run.reimar2010-02-021-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30487 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30486Uoti Urpala2010-03-090-0/+0
|\|
| * Revert r30324 which broken the struct addrinfo check by making it always pass.reimar2010-02-021-1/+2
| | | | | | | | | | | | | | Instead fix the MinGW64 issue properly by including ws2tcpip.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30486 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Estimate pts of additional frame generated by tfields also if correct-pts isreimar2010-02-011-4/+9
| | | | | | | | | | | | | | | | not set, even if it is not very relevant currently. Based on patch by John Lindgren [john lindgren tds net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30485 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30484Uoti Urpala2010-03-097-26/+412
|\|
| * Enable query_format for vf_tfields to make sure it isn't used for formatsreimar2010-02-011-4/+5
| | | | | | | | | | | | | | that definitely do not work, e.g. RBG with tfields=1 mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30484 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix -vf tfields=1 so it does not read out of bounds or leave parts of thereimar2010-02-011-3/+9
| | | | | | | | | | | | | | output frame uninitialized. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30483 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reword tfields documentation to reflect that it works mostly with MPlayer,reimar2010-02-011-2/+2
| | | | | | | | | | | | | | not just mencoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30482 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add OS/2 KAI audio driver supportkomh2010-02-016-0/+379
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
| * misc fixesdiego2010-02-011-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30480 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn changes up to r30479Uoti Urpala2010-03-090-0/+0
|\|