summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* av_log callback handling overhaulUoti Urpala2009-10-316-51/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move av_log callback handling from vd_ffmpeg.c to a new file av_log.c and install the callback immediately when starting the program. Main functionality improvements of the new code: - The old version only installed the callback when opening an FFmpeg video decoder. If nothing had triggered that then av_log() messages from other sources (libavformat, audio decoding, swscale usage) bypassed MPlayer's output system completely. Now the callback is always installed. - Current av_log message severity levels are handled correctly. The old code used MSGL_ERR for some messages that should be MSGL_V. - Message type is now set for libavformat contexts (MSGT_DEMUXER / MSGT_MUXER). - The old code did "mp_msg_test(type, mp_level)" before actually determining the type, so that it always used MSGT_FIXME. This led to some messages being incorrectly dropped in case the user had specified module-specific verbosity levels. The old check in question was originally motivated by performance problems when there were a lot of callbacks; however it's not clear whether the part about it skipping the type determination was intentional (most of the performance problems must have come from the way the original code used snprintf) and in my tests current FFmpeg libraries have not generated unreasonable amounts of callbacks anyway.
* build: Support x264 version 78Uoti Urpala2009-10-192-2/+2
|
* demux_mkv: Stop moving FLAC extradata into stream packetsUoti Urpala2009-10-171-8/+6
| | | | | | | | | | | | | | | | | | | | | | | The Matroska demuxer didn't place FLAC codec extradata in the normal extradata field but instead constructed a fake data packet and inserted that at the start of the demuxer stream. Current FFmpeg FLAC decoder can read the data from the proper extradata field too, so use that mechanism instead. This fixes a problem with files that use ordered chapters to load external segments from other files that have FLAC audio. In that case there can be a seek before the audio decoder is first initialized, and the seek will flush all stream packets so the decoder would never see the inserted extra packet. That particular issue could be fixed by initializing the decoder before any seeks instead (and there could still be other similar problem cases where doing that would be more robust), but this change is still generally right. I think the previous code would also cause problems in case there are multiple audio streams; there's only a single demuxer stream used for data packets, meaning that a packet inserted for the sake of a secondary audio stream could be read by the codec of the default stream (possibly not FLAC at all) and the packet would not be available when switching to the secondary audio stream later.
* manpage: Fix typo in -noordered-chapters option nameUoti Urpala2009-10-081-1/+1
| | | | | The manual page said "-noorderedchapters" without a hyphen while the actual option name is "-noordered-chapters".
* configure: Disable OpenAL support by defaultUoti Urpala2009-10-061-2/+2
| | | | | | | | | | | | | There's apparently a new OpenAL version which contains some constructor code that runs at startup if the binary links with OpenAL at all (even if no OpenAL function is called). This startup code does some nontrivial interaction with ALSA libraries and as a side effect this idiocy also breaks test binaries run by configure, causing features to not be detected. Avoid the problems by disabling OpenAL by default. It's not a particularly good audio output method anyway and there are almost certainly fewer users who would benefit from it automatically being available than users who'd suffer from some kind of breakage caused by it.
* Merge svn changes up to r29752Uoti Urpala2009-10-0659-251/+362
|\ | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * add a warning to the description of -vf screenshot to add it afterattila2009-10-051-0/+4
| | | | | | | | | | | | | | | | all other filters that should apply to it (fix PEBCAK as seen on #mplayer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29752 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Play TrueHD in BluRay with demuxer lavf.cehoyos2009-10-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29751 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fix calculation of ao_data.bps for sample formats with more than 16 bitscladisch2009-10-051-1/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29750 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix definition of KEY_PAGE_DOWN.cehoyos2009-10-041-1/+1
| | | | | | | | | | | | | | Patch by Aaro Koskinen, aaro D koskinen A iki D fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29749 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the ao_alsa play function always process a multiple of ao_data.outburstreimar2009-10-021-1/+4
| | | | | | | | | | | | | | | | except for the last chunk. Should fix high CPU usage reported e.g. here: http://bugs.gentoo.org/show_bug.cgi?id=286020 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29748 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add EXTERN_ASM define needed by FFmpeg on ARM.reimar2009-10-021-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29747 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r29731jrash2009-10-011-1/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29746 b3059339-0415-0410-9bf9-f77b7e298cf2
| * updatescompn2009-10-011-2/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29745 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark some functions that do not need external visibility as static.diego2009-09-302-2/+2
| | | | | | | | | | | | | | patch by Alexander Neumann, alexander bumpern de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29744 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend EBX_AVAILABLE check in a way that works for both OpenBSD/Haikureimar2009-09-301-0/+2
| | | | | | | | | | | | | | and 64 bit OSX. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29743 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reduce console output verbosity: Move colorspace information to verbose mode.diego2009-09-3024-35/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29742 b3059339-0415-0410-9bf9-f77b7e298cf2
| * lavf: if seeking in the desired direction failed, also try in the opposite one,reimar2009-09-301-1/+4
| | | | | | | | | | | | | | | | otherwise we might end up at some random position (where lavf last ended up while trying to build the index). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid void * arithmetic.reimar2009-09-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29740 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify aac_get_sample_rate_indexreimar2009-09-301-24/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29739 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check for grow_array allocation failure.reimar2009-09-301-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29738 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid a possible crash if num_cluster_pos is 0.reimar2009-09-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29737 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check for integer overflow in grow_array.reimar2009-09-301-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29736 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rearrange code of grow_array to make it easier to extend.reimar2009-09-301-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29735 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid a memleak if realloc fails in grow_array.reimar2009-09-301-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29734 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change grow_array argument from void ** to void *, this avoids a aliasingreimar2009-09-301-4/+5
| | | | | | | | | | | | | | | | violation (thus making gcc 4.4.x compile the code correctly) and allows to get rid of some casts at the expense of making the code less clear. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29733 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make -nosub work to disable subtitles even if -slang and dvd streams are used.reimar2009-09-292-4/+2
| | | | | | | | | | | | | | This still needs some additional checking that subtitle selection via dvdnav works. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29732 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document -nosub optionreimar2009-09-281-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29731 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a -nosub option that allows disabling auto-selected subtitles as e.g. thereimar2009-09-283-7/+8
| | | | | | | | | | | | | | mkv demuxer supports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow -1 and -2 values for -aid, -vid and -sid (meaning "auto" and ↵reimar2009-09-281-3/+3
| | | | | | | | | | | | "disabled" respectively). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29729 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable loading of external subtitles also for audio-only files.reimar2009-09-281-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29728 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use a_pos to update subtitle for audio-only files instead of ↵reimar2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | mpctx->sh_audio->pts which e.g. for mp3 in AVI never has a useful value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29727 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Call set_osd_subtitle also for external subs (i.e. in find_subs).reimar2009-09-281-26/+29
| | | | | | | | | | | | | | | | This does not yet seem to work for audio-only files, subtitles seem not to be loaded then. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29726 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Intel compiler icc 11.1 supports compilation of internal mp3lib and internal ↵cehoyos2009-09-271-2/+2
| | | | | | | | | | | | liba52. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29725 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Fix whitespace.cehoyos2009-09-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29724 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set sensible write frequency/priority values for AllocateMemoryMESAreimar2009-09-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29723 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print error instead of crashing when mesa-buffer is used on systemsreimar2009-09-271-0/+4
| | | | | | | | | | | | | | that do not support it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29722 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also check GLX client and server strings for extensionsreimar2009-09-271-2/+27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29721 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Amend previous commit: both zlib decoder and encoder must be disabledreimar2009-09-261-2/+2
| | | | | | | | | | | | | | if zlib is not available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29720 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable libavcodec zlib decoder when zlib is not available, fixes compilationreimar2009-09-261-1/+1
| | | | | | | | | | | | | | in that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29719 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change libaf control ordering to make the controls unique again, ↵reimar2009-09-261-12/+12
| | | | | | | | | | | | | | | | | | (AF_CONTROL_PAN_BALANCE vs. AF_CONTROL_PLAYBACK_SPEED), put them in-order again and add a bit of padding in-between. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29718 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not override host_arch in x86 vs. x86_64 detection if it was forced via ↵reimar2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | --target. Patch by Andrew Wason [rectalogic rectalogic com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29717 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change type to avoid void * arithmetic.reimar2009-09-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29716 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set codec_type and codec_id in codec context for lavc encoders.reimar2009-09-252-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29715 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync with current FFmpeg HEAD.diego2009-09-243-28/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29714 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATICdiego2009-09-242-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29713 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for displaying subtitles on the command-line when playingreimar2009-09-235-6/+34
| | | | | | | | | | | | | | audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29712 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make function argument name in header match name in .c file.reimar2009-09-231-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29711 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make update_subtitles work without sh_video for text subtitles.reimar2009-09-235-9/+13
| | | | | | | | | | | | | | | | | | This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure avctx->codec_type and codec_id are set, since libavcodecreimar2009-09-232-0/+3
| | | | | | | | | | | | | | | | | | currently requires that. That probably is an unintended API change and should be fixed/reverted in lavc but it hurts little to workaround here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29709 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Include mpcommon.h in mpcommon.c, ensures that the declarations in the headerreimar2009-09-231-0/+1
| | | | | | | | | | | | | | match those in the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29708 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out sh_video->pts into a refpts variable. This simplifies a future patchreimar2009-09-231-12/+12
| | | | | | | | | | | | | | that reduces the dependency on sh_video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29707 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename ambiguous "pts" variable to subpts.reimar2009-09-231-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29706 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use x264_encoder_delayed_frames instead of the current hack to flush delayedreimar2009-09-231-4/+2
| | | | | | | | | | | | | | frames in VFCTRL_FLUSH_FRAMES. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29705 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync to x264-r1260 (which changed api)lorenm2009-09-232-35/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add 0x85 ad ID for DTS audio.diego2009-09-231-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29703 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix teletext font autoscaling.cehoyos2009-09-221-2/+2
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29702 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace manual gcc version check by AV_GC