summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn r30174Uoti Urpala2010-01-083-0/+13
|\
| * Add support for JPEG2000 via FFmpeg/OpenJPEGreimar2010-01-034-0/+42
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30173Uoti Urpala2010-01-087-7/+30
|\|
| * Also support decoding of 8-bit-per-component dpx files.reimar2010-01-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30173 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify usePal() macro, make it use av_pix_fmt_descriptors.stefano2010-01-031-7/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30172 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify getSubSampleFactors(), make it use the values provided bystefano2010-01-031-47/+2
| | | | | | | | | | | | | | av_pix_fmt_descriptors(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30171 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark AC3 as 16-bit format, this simplifies alignment calculation and fixesreimar2010-01-021-1/+1
| | | | | | | | | | | | | | hwac3 with ALSA reportedly broken by r29750. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30170 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Several hacks to fix compilation of tvi_dshow on MinGW64.reimar2010-01-024-5/+27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix typo in code disabling VIDIX on mingw64reimar2010-01-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30168 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable vidix on 64 bit MinGW compiles, it seems to fail compiling andreimar2010-01-021-0/+1
| | | | | | | | | | | | | | certainly was never tested. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30167 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Ignore svn change r30166Uoti Urpala2010-01-080-0/+0
|\|
| * Fix compilation if FreeType is not available, in particular do not try to buildreimar2010-01-012-1/+3
| | | | | | | | | | | | libass and use the internal ass.h as a stub for structs needed for EOSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-0833-378/+753
|\|
| * Simplify range-checking functions for subopt parsing.reimar2010-01-014-15/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix function declarations to avoid casting function pointers.reimar2010-01-0114-31/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly generalize code to generate YUV->RGB conversion table and addreimar2010-01-013-21/+37
| | | | | | | | | | | | | | XYZ->RGB conversion as an example for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30163 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r30135jrash2010-01-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30162 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make YUV->RGB conversion coefficients selectable for -vo gl.reimar2010-01-011-1/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not needlessly use the BP register in x86_64-specific code, there arereimar2010-01-011-4/+4
| | | | | | | | | | | | | | enough other registers available that are less likely to cause issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30160 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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-319-4/+23
| | | | | | | | | | | | | | | | 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 FFmpeg's ffv210 codec.reimar2009-12-311-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30153 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 16-bit per component YUV formats.reimar2009-12-3112-19/+117
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First steps to supporting different YUV->RGB conversion definitions.reimar2009-12-314-10/+50
| | | | | | | | | | | | | | The numbers are possibly still wrong though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extract functions to generate yuv->rgb matrices and lookup tables into areimar2009-12-315-112/+169
| | | | | | | | | | | | | | separate file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Put the colourspace-related variables into a separate struct to easereimar2009-12-314-15/+20
| | | | | | | | | | | | | | extracting the code and sharing with other vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make code slightly more readable.reimar2009-12-311-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30148 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.reimar2009-12-311-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More readable fourcc for ffflacreimar2009-12-311-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30146 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a hack for broken youtube servers not returning Accept-Ranges.reimar2009-12-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30145 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add tm2x / tm2a binary decodercompn2009-12-301-0/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30144 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the ffmpeg decoders for DTS and AC3 the default.reimar2009-12-301-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30143 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
| * FFmpeg JPEG codecs can output 440p format.reimar2009-12-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30141 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 440p colorspace.reimar2009-12-306-0/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support all planar YUV formats in OpenGL vos.reimar2009-12-304-58/+97
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 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
| * sync w/r30135 (up to date at last!)gpoirier2009-12-291-36/+97
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30137 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_mkv: improve seeking with generated indexUoti Urpala2010-01-011-46/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using generated index (-idx / -forceidx) the Matroska seeking code first guessed a file position using bitrate-based heuristics, then located the cluster nearest to that file position. Change it to store cluster timestamps in addition to file positions and seek to the cluster with the closest timestamp. This makes seeking with -idx a lot more accurate. This change also fixes a crash when trying to seek with generated index before playing any data from the beginning of the file (could be triggered by -idx together with ordered chapters or -ss for example). I removed the code handling MATROSKA_ID_CUES in the middle of parsing clusters. Such cue entries were not consistently handled if encountered during playback instead of index creation and the seek code was also buggy when they were encountered and parsed; i didn't consider it worth the effort to fix it.
* | demux_mkv: remove useless codeUoti Urpala2009-12-311-16/+2
| | | | | | | | | | Remove leftover code that no longer did anything useful after earlier changes.
* | demux_mkv: respect -forceidxUoti Urpala2009-12-311-1/+1
| | | | | | | | | | Don't use the index included in the file if the -forceidx option was specified.
* | Merge svn changes up to r30136Uoti Urpala2009-12-3022-1004/+1248
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * cosmetics: tabs to spaces, K&R function declarations, cuddle else clausesdiego2009-12-291-901/+853
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30136 b3059339-0415-0410-9bf9-f77b7e298cf2
| * change bandwidth value to bandwidth bytescompn2009-12-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30135 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.cehoyos2009-12-281-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert r30100: It breaks some mov and asf samples.cehoyos2009-12-281-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable, fixes the warning:diego2009-12-281-1/+0
| | | | | | | | | | | | | | libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30132 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add lavc yuv rawcodecs to codecs.confcompn2009-12-271-0/+105
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30131 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for parsing audio streams (though should be easy to extend to video)reimar2009-12-277-3/+156
| | | | | | | | | | | | | | | | | | | | | | 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
| * Remove currently unneeded members accidentally added in the last revision.reimar2009-12-271-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30129 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Introduce a sh_common struct that contains the parts in common by the audio, ↵reimar2009-12-271-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | video and sub "stream headers". One reason for this is to help avoid/make more obvious things like members with the same function but different name (extradata vs. codecdata etc.), or members with the same name but different semantics (pts for audio vs. pts for video). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30128 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove one more incorrect direct ass.h include.reimar2009-12-271-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30127 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move do_render_osd function to avoid a forward declaration.reimar2009-12-271-32/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_x11_classhint name argument should be const, since we pass string ↵reimar2009-12-272-2/+2
| | | | | | | | | | | | constants there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30125 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Return the actually playing audio/video id for get_property, not the onereimar2009-12-271-12/+12
| | | | | | | | | | | | | | | | selected e.g. via commandline (which resulted in -1 being returned most of the time). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30124 b3059339-0415-0410-9bf9-f77b7e298cf2
| * lavc Interplay Video decoder now supports 16-bit mode tookostya2009-12-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30123 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Subtitle are now also available without video, so remove thatreimar2009-12-271-3/+0
| | | | | | | | | | | | | | check from the subtitle property handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30122 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the same condition to decide if the audio/video id property isreimar2009-12-271-12/+4
|