summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27514Uoti Urpala2008-09-03103-521/+494
|\
| * support E-AC-3 decoding using ffmpegaurel2008-09-013-0/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27514 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove Windows-specific #ifdefs, the file does not compile on MinGW anyway.diego2008-09-011-10/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27513 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ignore .exe files on Windows.diego2008-09-010-0/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27512 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename --enable-tremor-external option to --enable-tremor along with thediego2008-09-011-8/+8
| | | | | | | | | | | | | | corresponding variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27511 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not refer to libcdio and liblzo as external in the help output.diego2008-09-011-2/+2
| | | | | | | | | | | | | | External libraries are the default, no need to stress this fact. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27510 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename --enable-faad-external option to --enable-faad along with thediego2008-09-011-14/+10
| | | | | | | | | | | | | | corresponding variables. This allows simplifying the libfaad check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27509 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Initialize _def_faad* variables to disabled before setting them.diego2008-09-011-2/+2
| | | | | | | | | | | | | | This fixes _def_faad_internal never being set when using external libfaad. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27508 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fall back on external libfaad check if internal libfaad check failed.diego2008-09-011-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27507 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Put '#define closesocket close' under proper '#ifndef HAVE_CLOSESOCKET'diego2008-09-011-1/+4
| | | | | | | | | | | | | | preprocessor condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27506 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move '#define closesocket close' preprocessor directive to a common placediego2008-09-0114-23/+17
| | | | | | | | | | | | | | and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27505 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert moving closesocket definition and network headers to network.h.diego2008-08-3114-15/+115
| | | | | | | | | | | | | | This caused lots of trouble on MinGW, we need a different solution. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only use winsock2.h to check for closesocket().diego2008-08-311-5/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27503 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix closesocket test, patch by Serge Levin, serge.levin.spb gmail com.diego2008-08-311-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27502 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add necessary #include <stdlib.h> for realloc/calloc/free.diego2008-08-311-0/+1
| | | | | | | | | | | | | | patch by JonY, 10walls gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27501 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused GUID_t definition that also incorrectly defined GUID_DEFINEDreimar2008-08-311-14/+0
| | | | | | | | | | | | (while actually not defining GUID, only GUID_t). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change header inclusion guard names in line with FFmpeg r15120.stefano2008-08-313-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename internal libdvdread fork from dvdread to libdvdreadrathann2008-08-3029-37/+37
| | | | | | | | | | | | | | | | to avoid clashing with external libdvdread. (Sync with libdvdread r1122) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print DVD volume ID with -identify.reimar2008-08-301-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move duplicated '#define closesocket close' into network.h along withdiego2008-08-2914-115/+15
| | | | | | | | | | | | | | network-related #include #ifdeffery. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
| * consistency cosmetics: Avoid using .. in #include paths.diego2008-08-298-52/+52
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync libdvdcss with upstream version 1.2.10.diego2008-08-2911-17/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27494 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.diego2008-08-2923-59/+60
| | | | | | | | | | | | | | | | | | This is what it is called in FFmpeg and more consistent with other names for similar conditionals. This fixes a potential compilation failure on MinGW, as described in Bugzilla #1262. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement swscale_version().stefano2008-08-292-1/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27492 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless '#if 1 [...] #endif' around has_cpuid() function.diego2008-08-291-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27491 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement check for closesocket(), needed by libavformat, fixes Bugzilla #1257.diego2008-08-291-0/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27490 b3059339-0415-0410-9bf9-f77b7e298cf2
| * handle the lavfpref demuxer in the same way as the lavf oneaurel2008-08-273-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with r27454ptt2008-08-271-15/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27488 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync'ed to r27071ptt2008-08-271-66/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27487 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop av_always_inline definition. It is duplicated from libavutil anddiego2008-08-262-17/+5
| | | | | | | | | | | | | | unlikely to make any difference. This reduces the diff to upstream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27486 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename always_inline macro to av_always_inline so as not to clash withdiego2008-08-262-8/+8
| | | | | | | | | | | | | | | | with __attribute__((always_inline)) declarations. This fixes the build on Mac OS X 10.4.11. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27485 b3059339-0415-0410-9bf9-f77b7e298cf2
| * prefer libavformat to demux matroska filesaurel2008-08-261-0/+1
| | | | | | | | | | | | | | I can't spot any regression anymore. If you find one, please tell me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27484 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix forumla -> formula in commentreimar2008-08-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27483 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix 'cast from pointer to integer of different size' on 64bit architectures. ↵ranma2008-08-241-1/+1
| | | | | | | | | | | | Casting to long should work for 32bit and 64bit and not make a difference to the boolean operation (since 'format' is always 32bit (int) the upper 32bit of 'arg' won't matter, but the compiler should be happy now. Casting both to unsigned makes sure the compiler isn't messing things up by sign-extending 'format' to 64bit before masking) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27482 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle AOPLAY_FINAL_CHUNKranma2008-08-241-33/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27481 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentationaurel2008-08-241-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27480 b3059339-0415-0410-9bf9-f77b7e298cf2
| * use new lavf API to grab sample_aspect_ratio from the demuxersaurel2008-08-241-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27479 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fix compiler warningsranma2008-08-231-8/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27478 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused and untested function. It is only part of our local patchset.diego2008-08-222-67/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27477 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove duplicate vsscanf fallback implementation, we have another in osdep/.diego2008-08-221-13/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27476 b3059339-0415-0410-9bf9-f77b7e298cf2
| * -geometry support for -vo fbdev.reimar2008-08-221-0/+2
| | | | | | | | | | | | | | Patch by Sander (thrill12 gmx net) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27475 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync libdvdcss with upstream version r212.diego2008-08-2110-15/+34
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27474 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for AAC decoding through FFmpeg; libfaad is preferred for now.diego2008-08-211-0/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27473 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove trailing whitespace and tabs.diego2008-08-211-21/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27472 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove SKIP_DEPS trick. The same effect can be achieved without it.diego2008-08-181-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fix for alignment problem on older ARM coresdiego2008-08-172-2/+2
| | | | | | | | | | | | | | patch by Siarhei Siamashka, siarhei.siamashka gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27470 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add check for ARM VFP instructions.diego2008-08-171-1/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27469 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync w/r27466gpoirier2008-08-151-1/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27468 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Work correctly with very small files where less than outburst is to be played.diego2008-08-151-0/+23
| | | | | | | | | | | | | | patch by Tobias Diedrich, ranma tdiedrich de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27467 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document -lavcopts o, aka libavcodec AVOption.michael2008-08-151-0/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27466 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg no longer has fastmemcpy support, so no longer trigger recursingdiego2008-08-141-1/+1
| | | | | | | | | | | | | | into the FFmpeg directories if libvo/fastmemcpy.h changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused static declarations, fixes the warnings:diego2008-08-141-6/+0
| | | | | | | | | | | | | | | | libmpcodecs/vd_qtvideo.c:69: warning: 'ImageCodecDrawBand' defined but not used libmpcodecs/vd_qtvideo.c:71: warning: 'ImageCodecEndBand' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27464 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use '#include <poll.h>' instead of '#include <sys/poll.h>'.diego2008-08-146-8/+8
| | | | | | | | | | | | | | It is the standard location as defined by the Open Group. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27463 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l: Rename missed preprocessor directives from a HAVE_ prefix to CONFIG_.diego2008-08-142-16/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27462 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add mapping for real audio and video CODEC_ID to MPlayer's fourccaurel2008-08-131-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27461 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fixes spotted by diegocompn2008-08-131-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27460 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_lavf: fix mp_seek behavior in case of seeking erroraurel2008-08-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | When trying to seek past the end of file, the ByteIOContext expect that the stream is left in the same state as it was before the tentative seek. stream_seek() does not meet this expectation. It changes current position when seeking past the end of file. Thus, it is necessary to reset the stream to its previous state after a seek failure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27459 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: Clean up move-to-next-file logicUoti Urpala2008-08-133-65/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mpctx->eof field was used to also store other reasons to stop playing the current file besides EOF, and the code didn't properly distinguish those from EOF. Rename the field to "stop_play" and clean up some of the code accessing it. Properly separating EOF from other reasons allows handling file switching better. Before this commit buffered audio was always drained before moving to the next file (the only exception when it was NOT drained when stopping a file was when quitting the player completely). This added an extra delay when manually moving to the next file as you had to wait for the currently buffered audio to finish playing before the next file would start. After this commit audio is only drained if the file reaches EOF normally; otherwise audio is cut and the next file starts immediately.
* | Use correct terminal "clear line" codeUoti Urpala2008-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The "erase_to_end_of_line" string used to clear the terminal status line was initialized with the termcap id "cd", which means to clear all lines below the cursor. Change it to the correct "ce" to clear the current line. Usually the status line is on the bottommost line of the terminal so the behaviour wouldn't differ much. However it did make a difference when I tested starting MPlayer at the top of a huge gnome-terminal window so the status line was not at the bottom; in that case clearing just the current line used less CPU than clearing the part of the huge window below the status line.
* | Merge svn changes up to r27458Uoti Urpala2008-08-1219-59/+689
|\|
| * Remove pointl