summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r31303Uoti Urpala2010-06-026-44/+68
|\
| * avoid using swscale internals by copying in palette8torbg16 and its bgr variantsiretart2010-06-011-1/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend geometry parsing to reject all invalid strings.reimar2010-06-011-9/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31302 b3059339-0415-0410-9bf9-f77b7e298cf2
| * deprecate palette8topacked32 in favor of public API functions ↵siretart2010-06-015-39/+81
| | | | | | | | | | | | | | | | | | | | | | | | sws_convertPalette8ToPacked32 and -24 additionallym deprecate palette8torgb16 and its bgr variant without replacement. These functions are not meant to be used by applications. Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move internal scale context fields initialization fromstefano2010-06-012-50/+24
| | | | | | | | | | | | | | | | sws_setColorspaceDetails() to ff_yuv2rgb_c_init_tables(). Allow to factorize duplicated code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31300 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r23402.cehoyos2010-06-012-5/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove palette8torgb15 and palette8tobgr15siretart2010-06-013-28/+0
| | | | | | | | | | | | | | | | | | They contain exactly the same code as their 16bit variants, so this is effectively code de-duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out some common code and ensure we will not try to draw OSDreimar2010-05-311-3/+12
| | | | | | | | | | | | | | elements outside the streams and thus crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31297 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent.reimar2010-05-311-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31296 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix subtitle display for http://samples.mplayerhq.hu/sub/largeres_vobsub.mkvreimar2010-05-311-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31295 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes up to r31294 (mostly)Uoti Urpala2010-06-021-0/+1
|\| | | | | | | | | | | | | | | | | | | -a52drc range extension was already done earlier (and the svn commit is buggy for ad_liba52). However keep the man page change (this is the only part not skipped). We don't want to use lavf for Matroska demuxing; it's questionable whether that's a good idea even in svn, and the internal demuxer here is definitely a better choice.
| * Switch mkv demuxing to lavf by default.aurel2010-05-311-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31294 b3059339-0415-0410-9bf9-f77b7e298cf2
| * backport ass_flush_events() from upstream libass and make use of itaurel2010-05-313-0/+25
| | | | | | | | | | | | | | | | This fixes subtitles duplication when seeking back in ass stream formated with the "standard" format FFmpeg uses. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31293 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend the range of the -a52drc range up to two, as a experimental featurereimar2010-05-312-1/+2
| | | | | | | | | | | | | | in case someone finds it useful. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31292 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31291Uoti Urpala2010-06-0212-13/+43
|\|
| * Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.diego2010-05-305-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * synced with r31289Gabrov2010-05-302-10/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31290 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change code to let Window Manager chose window location by default.reimar2010-05-302-1/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31289 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a referrer option to set the HTTP Referer field.reimar2010-05-304-0/+24
| | | | | | | | | | | | | | Patch by chocolateboy [chocolate cpan org] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31288 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes up to r31287Uoti Urpala2010-06-020-0/+0
|\|
| * Forgotten part of previous commit (extern declaration of drc_level).reimar2010-05-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31287 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the -a52drc option also for the libavcodec decoder.reimar2010-05-305-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31286 b3059339-0415-0410-9bf9-f77b7e298cf2
* | ad_ffmpeg: set lavc drc_scale parameter according to opts->drc_levelUoti Urpala2010-06-021-0/+3
| |
* | options: move -a52drc to option structUoti Urpala2010-06-024-14/+10
| | | | | | | | Also allow a range up to 2.
* | Skip svn change r31285Uoti Urpala2010-06-020-0/+0
|\| | | | | | | Internal FFmpeg build stuff.
| * Fix compilation without librtmp.cehoyos2010-05-301-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31285 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31284Uoti Urpala2010-06-027-1919/+1925
|\|
| * Treat a NULL renderer string as indication for software renderer.reimar2010-05-301-1/+1
| | | | | | | | | | | | | | Usually it means OpenGL will not work at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31284 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Prefer -vo sdl over "probably software" OpenGL.reimar2010-05-301-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31283 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change compiler argument order for compile_check to avoid incorrect linkingreimar2010-05-301-3/+5
| | | | | | | | | | | | | | errors during detection with static libraries (in particular OpenGL + static SDL). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31282 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make 3dnow and MMX code compile for 64 bit (just stupid search-and-replace).reimar2010-05-304-1912/+1916
| | | | | | | | | | | | | | | | They are not compiled/enabled on 64 bit though, since they are vastly slower but would still be selected by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31281 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes up to r31280Uoti Urpala2010-06-020-0/+0
|\| | | | | | | Mostly stuff related to internal FFmpeg builds only.
| * Add codec-cfg.h to the dependency list of codec-cfg.diego2010-05-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31280 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename yuv2rgb_template2.c --> yuv2rgb_template.c now that the other is gone.diego2010-05-302-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31279 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove GPL-licensed YUV to RGB MMX routines.diego2010-05-302-572/+0
| | | | | | | | | | | | | | We now have an LGPL replacement that is at least equally fast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31278 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add librtmp supporthyc2010-05-301-2/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31277 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cast void* pointer to appropriate type before using it in an addition; fixesdiego2010-05-291-1/+1
| | | | | | | | | | | | | | libmpdemux/demux_mkv.c:1873: warning: pointer of type 'void *' used in arithmetic git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31276 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31275Uoti Urpala2010-06-023-20/+25
|\|
| * Update 1.0rc3 release name and date.diego2010-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31275 b3059339-0415-0410-9bf9-f77b7e298cf2
| * minor spelling fixessiretart2010-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31274 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add myself to the AUTHORS filesiretart2010-05-291-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31273 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use edi instead of ebx to avoid issues with PIC.reimar2010-05-291-19/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31268 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes up to r31267Uoti Urpala2010-06-020-0/+0
|\| | | | | | | | | Perhaps porting some of the non-pkgconfig libass detection logic from configure would have some use, but I'm not doing it now at least.
| * Remove obsolete may_alias-related defines, lavu handles this nowreimar2010-05-291-2/+0
| | | | | | | | | | | | | | directly with compiler-version checks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31267 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Actually run a detection whether external libass exists, insteadreimar2010-05-291-2/+17
| | | | | | | | | | | | | | of just assuming it does when internal libass is disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31266 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31265Uoti Urpala2010-06-023-22/+26
|\|
| * Fix compilation if the compiler does not support -march=amdfam10reimar2010-05-291-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31265 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Drop leading '_' from noinputmodules variable.diego2010-05-291-21/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31264 b3059339-0415-0410-9bf9-f77b7e298cf2
| * misc cosmetics: K&R style nits, #include placement, indentationdiego2010-05-294-80/+84
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark key_type structure as const.diego2010-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31262 b3059339-0415-0410-9bf9-f77b7e298cf2
| * getch2-os2.c: Add #include for the header that declares the public functions.diego2010-05-291-0/+1
| | | | | | | | | | | | | | This should fix a bunch of warnings on OS/2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31261 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove some commented-out #includes, fix a comment grammar error.diego2010-05-291-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31260 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Directly mark jpeg_buf_src() as void instead of using some indirection marcro.diego2010-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add "lpcJ" fourcc for the RealAudio 1.0 codec.compn2010-05-281-0/+1
| | | | | | | | | | | | | | patch by Francesco Lavra git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31257 b3059339-0415-0410-9bf9-f77b7e298cf2
* | stream_radio.c: fix corrupt line from e3061749Uoti Urpala2010-06-021-1/+1
| |
* | libass: match font attachments based on extensionGrigori Goronzy2010-06-014-8/+21
| | | | | | | | | | | | | | Instead of only relying on the MIME type, use the file extension as a fallback for deciding which attachments are fonts and should be fed to libass. This also refactors the check into a separate function in mpcommon.
* | demux_mkv: fix possible seek crashUoti Urpala2010-05-311-2/+2
| | | | | | | | | | | | | | | | | | Commit fc39d48465 ("demux_mkv: store streams sequentially in demuxer->[avs]_streams") had a copy-paste error causing it to look up a video ID where it should have been an audio one. The most likely visible symptom was a segfault when seeking while playing a high-numbered audio track. Looks like I was careless with that original commit, second bug in the same one...
* | demux_mkv: support VP8 video tagUoti Urpala2010-05-302-0/+2
| |
* | demux_mkv: support WebM filesUoti Urpala2010-05-301-2/+3
| | | | | | | | Accept files with doctype "webm" in addition to "matroska".
* | ffmpeg_files/taglists.c: update to contain latest FFmpeg CODEC_ID valuesUoti Urpala2010-05-301-1/+19
| |
* | Merge svn changes r31198 - r31256Uoti Urpala2010-05-3014-392/+193
|\ \ | | | | | | | | | | | | | | | The cache changes in r31198 were somewhat broken; merge them together with later fixes in one commit to keep all the "main branch side" commits working.
| * | Merge svn changes up to r31256Uoti Urpala2010-05-305-9/+47
| |\|
| | * Fix typo in message.reimar2010-05-281-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31256 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * stream_check_interrupt should sleep even if no callback is set.reimar2010-05-281-1/+4
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31255 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * 100l, stream_check_for_interrupt argument is not in usec,reimar2010-05-281-3/+3
| | | | | | | | |