summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30463Uoti Urpala2010-03-09139-69/+2480
|\ | | | | | | | | | | Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
| * Add missing license headers to all files in the libmpcodecs directory.diego2010-01-30135-64/+2461
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove confusing comment.diego2010-01-301-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30462 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support more qscale types in most post-processing filters.reimar2010-01-295-4/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30454 b3059339-0415-0410-9bf9-f77b7e298cf2
* | translations: tweak cases that relied on concatenating adjacent stringsUoti Urpala2010-03-071-5/+6
| | | | | | | | | | | | | | | | Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used.
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-072-2/+2
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | ad_faad: move message "input bitrate missing" to MSGL_VUoti Urpala2010-01-311-1/+1
| | | | | | | | | | | | The input bitrate isn't needed for anything in normal playback, so there is no reason to print a warning message for practically all files using the decoder.
* | Merge svn changes up to r30437Uoti Urpala2010-01-283-4/+19
|\|
| * Add an option to cropdetect to periodically reset the detected area.reimar2010-01-261-4/+16
| | | | | | | | | | | | | | Patch by [quetschke scytek de] with modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30436 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fail ad_pcm initialization of WAVEFORMATEX header is missing instead of ↵reimar2010-01-241-0/+2
| | | | | | | | | | | | crashing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30428 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reset the parser on seek. Should fix some cases of audio "blips" after seeking.reimar2010-01-241-0/+1
| | | | | | | | | | | | | | AC3 is still broken due to the libavcodec parser being broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30421 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move the resync-related code into more consistent places instead of having itreimar2010-01-242-0/+6
| | | | | | | | | | | | | | scattered all over the place with half of it forgotten in some places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30420 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30419Uoti Urpala2010-01-255-22/+88
|\|
| * Switch -vf halfpack to use only public API of libswscale.reimar2010-01-231-4/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30410 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the scale filter prefer yuv conversions that do not need chroma scaling.reimar2010-01-231-7/+41
| | | | | | | | | | | | | | Also always try keeping input and output format the same first. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30409 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove the query_format_cache, it is extra complexity that makes improvementsreimar2010-01-231-6/+1
| | | | | | | | | | | | | | difficult while the speed advantage in normal use cases is not measurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30408 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify loop conditionreimar2010-01-231-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30407 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure that a qstride of 0 (intentional or not) does not completely breakreimar2010-01-232-5/+17
| | | | | | | | | | | | | | the code (crash if malloc(0) != NULL, otherwise wrong qscales used for B-frames). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30405 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove any auto-inserted lavc filter.reimar2010-01-221-2/+9
| | | | | | | | | | | | | | | | Makes sure it will not be around if we e.g. try again with a different codec, which can lead to -vo null being excessively slow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30391 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30375Uoti Urpala2010-01-252-24/+21
|\|
| * Add a proper header for our strsep implementation so strsep willreimar2010-01-171-0/+1
| | | | | | | | | | | | | | not be used without a declaration, causing issues on 64 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse the fmt-conversion code instead of duplicating the functionality.reimar2010-01-171-24/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30354 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add big- and little-endian variants of the 15 and 16 bit RGB/BGR formats.reimar2010-01-171-0/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30353 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30322Uoti Urpala2010-01-251-1/+1
|\|
| * We only need to disable seeking back in ad_ffmpeg when we actually _use_reimar2010-01-151-1/+1
| | | | | | | | | | | | | | | | a parser, not when just needs_parsing is set. Fixes playback of e.g. ADPCM in AVI like http://samples.mplayerhq.hu/avi/imaadpcm.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30314 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30301Uoti Urpala2010-01-252-39/+51
|\|
| * 100l, fix typo that caused ad_hwac3 to fail to compile.reimar2010-01-121-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30290 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Attempt a simple hack to fix -ac hwdtsreimar2010-01-121-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30288 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More changes needed to make ad_hwac3 truly independent from liba52.reimar2010-01-112-7/+1
| | | | | | | | | | | | | | Patch by Benoît Amiaux [benoit amiaux gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30286 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Let the format filter do the AC3 endianness conversion instead of duplicatingreimar2010-01-111-16/+7
| | | | | | | | | | | | | | the conversion code over and over. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30285 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for distinguishing between little- and big-endian SPDIF AC3reimar2010-01-111-1/+1
| | | | | | | | | | | | | | and converting between both. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication,reimar2010-01-111-16/+40
| | | | | | | | | | | | | | though that is already done that way for dts support in hwac3. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30250Uoti Urpala2010-01-251-1/+1
|\|
| * vf crop: do not generate 0-size slices, they are pointless and also confusereimar2010-01-081-1/+1
| | | | | | | | | | | | | | libswscale to assume the wrong slice order. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30245 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vd_ffmpeg: fix compilation with neither VDPAU nor XvMC enabledUoti Urpala2010-01-211-2/+0
| | | | | | | | | | | | | | | | | | The get_format() function was defined under #if CONFIG_XVMC || CONFIG_VDPAU but recent commit ca217f4557c3cff4f2bf33e605ce13e662e84a92 added an unconditional reference to it, causing linking to fail with an undefined reference if neither feature was enabled. Fix by removing the #if, there's no reason reason why it would be needed.
* | vd_ffmpeg: FFmpeg-mt changed has_b_frames API, updateUoti Urpala2010-01-201-1/+2
| |
* | vd_ffmpeg: move redundant info messages to MSGL_V levelUoti Urpala2010-01-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Move two messages printed when using VDPAU/XvMC to MSGL_V level: "[VD_FFMPEG] XVMC-accelerated MPEG-2.\n" "[VD_FFMPEG] Trying pixfmt=%d.\n" The first is redundant because this info is normally visible from the decoder name, and it was also incorrectly printed in the VDPAU case too. Add a different MSGL_V message for VDPAU. Also make all these messages not translatable.
* | vd_ffmpeg: disable callbacks for threaded decodingUoti Urpala2010-01-201-38/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPlayer's slice and direct rendering related callbacks are not safe to call from other threads, so disable those features if more than one decoding thread is specified. This should fix some issues when using threaded decoding with formats other than h264 (in the h264 case the callbacks were already disabled for other reasons). This commit moves most of the code that sets special avctx parameters for VDPAU and XvMC. Before that was done after avcodec_open() based on the selected output image format; now it's done before avcodec_open() based on the capabilities of the selected decoder. At least the code selecting the thread count must be before avcodec_open(), and I think there is no reason to try to keep the previous structure otherwise either. The image format-based approach was implemented by Reimar with the intended goal of eventually selecting between software and VDPAU decoders under one FFmpeg decoder type. I consider that goal to be questionable, and the approach certainly made the existing code significantly messier for no functionality benefit.
* | Avoid misleading error "ASS: cannot add video filter"Uoti Urpala2010-01-163-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using libass with a VO that has direct EOSD support the vf_ass video filter is unnecessary and is not added automatically, but the code that adds the filter when it is needed produced misleading output messages in this case. The following two messages were printed at MSGL_ERR level, making it look like an error condition: Couldn't open video filter 'ass'. ASS: cannot add video filter Add a version of vf_open_plugin() called vf_open_plugin_noerr() that does not itself print an error message if opening a vf fails and that returns the exact status code returned by the vf open() function. Make vf_ass return a different status code depending on whether there was an actual error or if it determined a filter would be redundant. Use the _noerr function in the code adding the filter to avoid the first message and check the status code to avoid the second.
* | Merge svn changes up to r30236Uoti Urpala2010-01-081-0/+2
|\|
| * Avoid the error message "Unsupported PixelFormat -1" for ffh264 decodingzuxy2010-01-071-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30233 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30195Uoti Urpala2010-01-082-5/+5
|\|
| * Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).reimar2010-01-032-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30192 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30185Uoti Urpala2010-01-081-0/+1
|\|
| * Add missing avcodec_close to vf_screenshot.reimar2010-01-031-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30185 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-087-99/+173
|\|
| * One more fix for -vf scale with alpha.reimar2010-01-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30159 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also pass alpha plane to swscale, avoids crashes when converting betweenreimar2010-01-011-4/+4
| | | | | | | | | | | | | | YUV with alpha and some other format supporting alpha. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30158 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for YUV format with alpha and fix the codecs.conf entry for vp6areimar2009-12-315-3/+17
| | | | | | | | | | | | | | | | to use it. Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also pass the 4th plane for planar formats on to libavcodec.reimar2009-12-311-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30156 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to put the list of output formats for vf_scale in a more sensiblereimar2009-12-311-6/+6
| | | | | | | | | | | | | | | | | | order. While the 16-bit yuv formats should not be preferred over the 8-bit ones, it seems reasonable to probe them directly after the equivalent 8-bit formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30155 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Deduplicate the mp_image planes allocation code.reimar2009-12-312-63/+35
| | | | | | | | | | | | | | | | | | The code in vf.c and mp_image.c is almost the same, though the one in vf.c is more up-to-date/has more bug fixes and thus is used as the basis (which is why the diff is so big). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30154 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 16-bit per component YUV formats.reimar2009-12-316-14/+73
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support 440P in scale filter.reimar2009-12-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30142 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 440p colorspace.reimar2009-12-303-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a helper function to get the chroma scale shift and use to simplify mpi ↵reimar2009-12-303-33/+50
| | | | | | | | | | | | setup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30138 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Uoti Urpala2009-12-306-10/+28
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Add support for parsing audio streams (though should be easy to extend to video)reimar2009-12-271-2/+13
| | | | | | | | | | | | | | | | | | | | | | via libavcodec. Parsing can be done at the demuxer stage (currently disabled) or at the decoder (ad_ffmpeg, enabled). Should allow using the libavcodec AAC, DTS, ... decoders independent of container format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2