summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | not available for all commands (get, set and print). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30121 b3059339-0415-0410-9bf9-f77b7e298cf2
| * When setting audio or video track make sure we will not try toreimar2009-12-271-2/+4
| | | | | | | | | | | | | | dereference a NULL pointer, e.g. because there is no video stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30120 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print a ANS_ERROR reply if one of the *_property slave command fails.reimar2009-12-271-2/+25
| | | | | | | | | | | | | | Based on patch by Adrian Stutz [adrian sttz ch]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30119 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set some freed pointers to NULL.reimar2009-12-261-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30118 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Free playtree_iter upon exiting MPlayerreimar2009-12-261-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30117 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support mp_image with allocated palette.reimar2009-12-263-7/+13
| | | | | | | | | | | | | | | | Fixes playback and a memory leak for FFmpeg codecs which use reget_buffer with paletted data, e.g. cdgraphics. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30116 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove only use if MP_IMGFLAG_RGB_PALETTE to allow giving the flag a slightlyreimar2009-12-261-1/+0
| | | | | | | | | | | | | | different meaning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30115 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Restore the old value of planes[1] in vf_palette at the end to ensurereimar2009-12-261-0/+2
| | | | | | | | | | | | | | we do not call free() on the fixed gray_pal array. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30114 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r30075jrash2009-12-261-3/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30113 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix grammar/missing verb in description.reimar2009-12-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30112 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary entries from extension_table, these formats are alreadyreimar2009-12-251-4/+0
| | | | | | | | | | | | | | in the lavf preferred_list, and thus will be handled by lavf immediately. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a (unfortunately rather long) explanation on how and when to use itreimar2009-12-251-0/+6
| | | | | | | | | | | | | | to the file extension -> demuxer mapping list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30110 b3059339-0415-0410-9bf9-f77b7e298cf2
| * force cdg to lavf demuxer in extensions.c, misdetected as mpeg otherwisecompn2009-12-241-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30109 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30108 (with "-s ours")Uoti Urpala2009-12-300-0/+0
|\| | | | | | | Skip more inferior external-libass support changes from svn.
| * Revert renaming of process_force_style to restore compilation againstreimar2009-12-244-6/+7
| | | | | | | | | | | | | | Ubuntu's libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30108 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some ugly hacks to make compiling against a newer external version of libass ↵reimar2009-12-248-4/+26
| | | | | | | | | | | | work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename process_force_style to ass_process_force_style to match the APIreimar2009-12-243-6/+6
| | | | | | | | | | | | | | as newer libass versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30106 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove more direct includes of libass/ass.hreimar2009-12-248-8/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30104Uoti Urpala2009-12-3012-287/+393
|\| | | | | | | Ignore the broken correct-pts change in r30100.
| * create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.confcompn2009-12-242-0/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Register lavc Aura 2 decoderkostya2009-12-231-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30103 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Register lavc Aura decoderkostya2009-12-231-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30102 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow passing variants of "mingw32" as system name to --target. This ensuresdiego2009-12-231-1/+1
| | | | | | | | | | | | | | backwards compatibility after switching from "mingw32msvc" to "mingw32". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30101 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files.cehoyos2009-12-221-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove parameters no longer used in h[yc]scale().ramiro2009-12-211-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30099 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move fast bilinear scaler code to the existing h[yc]scale_fast() functions.ramiro2009-12-212-196/+196
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30098 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename function pointers used to convert from the input pixel format to theramiro2009-12-212-55/+55
| | | | | | | | | | | | | | intermediate YV12 to a more descriptive name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check if chroma horizontal scaler is needed in sws_init_swScale().ramiro2009-12-212-4/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30096 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused fields from SwsContext.ramiro2009-12-211-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30095 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not auto-generate the C code to handle PCI vendor and device names.diego2009-12-203-46/+60
| | | | | | | | | | | | | | This part of the code does not change so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync w/r29731gpoirier2009-12-201-10/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30093 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused debugging output about total number of printed lines.diego2009-12-201-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30092 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Employ slightly better variable names for output files.diego2009-12-201-48/+48
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30091 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Eliminate completely pointless print_includes function.diego2009-12-201-7/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30090 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use "mingw32" instead of "mingw32msvc" as system name for MinGW with --target.diego2009-12-201-1/+1
| | | | | | | | | | | | | | The former is the official name used by the MinGW project. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30089 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not autogenerate vidix/pci_names.h.diego2009-12-203-22/+39
| | | | | | | | | | | | | | Its contents is always the same, so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30088 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Indentation.ramiro2009-12-202-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Indent.ramiro2009-12-201-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30086 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set fast_bilinear functions in sws_init_swScale().ramiro2009-12-201-12/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless return statements from functions that return nothing.diego2009-12-201-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move code to write multiple inclusion guards to generated files into functions.diego2009-12-201-15/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set horizontal scaler's range conversion in context in sws_init_swScale().ramiro2009-12-202-28/+50
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set horizontal scaler's src offsets in context in sws_init_swScale().ramiro2009-12-202-19/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30081 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Use more consistent formatting style for generated files.diego2009-12-201-36/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Use a consistent formattting style; tabs to spaces.diego2009-12-201-203/+196
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30079 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change %f to %e in generated fragment programs to avoid losing precision ↵reimar2009-12-201-26/+26
| | | | | | | | | | | | unnecessarily. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Run vidix/pci_db2c.awk directly instead of passing it to awk.diego2009-12-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30077 b3059339-0415-0410-9bf9-f77b7e298cf2