aboutsummaryrefslogtreecommitdiffhomepage
path: root/spudec.c
Commit message (Collapse)AuthorAge
* cleanup: don't check for NULL before free()Gravatar diego2010-11-08
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: support "clear" packet typeGravatar reimar2010-11-02
| | | | | | | | | | | Support "clear" packets that contain no data but instead clear the screen at a given time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32410 b3059339-0415-0410-9bf9-f77b7e298cf2 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32411 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: mark a parameter constGravatar diego2010-11-02
| | | | | | | Mark constant sws_spu_image() parameter as const, fixes the warning: spudec.c:874: warning: passing argument 2 of 'sws_scale' from incompatible pointer type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31959 b3059339-0415-0410-9bf9-f77b7e298cf2
* dvdnav: Support for image highlights for dvdnav menus.Gravatar reimar2010-11-02
| | | | | | Does not work 100% reliably and needs -sid 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31828 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Remove useless end_col/end_row variablesGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31827 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Slightly simplify rle decodingGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31799 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Remove a useless condition checkGravatar reimar2010-11-02
| | | | | | It's already handled a few lines further down (the len == 0 check). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31798 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Avoid useless malloc/freesGravatar reimar2010-11-02
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31797 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31800 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Remove useless NULL checks before free()Gravatar reimar2010-11-02
| | | | | | Also set pointers to NULL after freeing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31792 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Allocate memory for paletted image data separatelyGravatar reimar2010-11-02
| | | | | | Use a separate allocation to avoid issues with e.g. the "cut" function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31791 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Slightly simplify dvd subtitle RLE decodingGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31790 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Share paletted -> gray/alpha conversion codeGravatar reimar2010-11-02
| | | | | | | Also keep a copy of the raw rle-decoded data. Should simplify implementing palette changes and the rle decoding code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31789 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Simplify creation of color/alpha mapGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31788 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Faster paletted to OSD conversionGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31707 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Fix conversion from paletted to MPlayer's OSD formatGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31705 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Reuse spudec_draw for the unscaled caseGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31703 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: minor improvementsGravatar reimar2010-11-02
| | | | | | | | | | | | | | Remove useless casts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31702 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify alpha conversion code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31704 b3059339-0415-0410-9bf9-f77b7e298cf2 Document code inefficiency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31706 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Fix calc_bbox to always return sensible valuesGravatar reimar2010-11-02
| | | | | | | When the scaled width is equal to the current width we could reuse the previous bbox value, however we havent saved them anywhere... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31701 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: improve scaling for avcodec subsGravatar reimar2010-11-02
| | | | | | | Try to get subtitle scaling somewhat right with libavcodec decoded bitmap subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31697 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: add missing orig_frame_width settingGravatar reimar2010-11-02
| | | | | | 10l, also assign the original width in spudec_new_scaled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31696 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: indentation fixGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31695 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: Add support for PGS subtitle decoding via libavcodecGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: change subdelay handling and vobsub timingGravatar reimar2010-11-02
| | | | | | | | | | | Make subdelay handling work the same way for all subtitle types and also allow changing subtitle delay to work better with vobsubs. This probably breaks vobsub behaviour with timestamp wrapping though. Positive values for sub delay now delay subtitles compared to video, where before the effect was in the opposite direction. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31663 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: simplifyGravatar reimar2010-11-02
| | | | | | Reuse spudec_visible to avoid code duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31661 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec: Add warning about bad values in bounding box handlingGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31660 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec.c: Extract image allocation code to a separate functionGravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31659 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31303Gravatar Uoti Urpala2010-06-02
|\
| * Reindent.Gravatar reimar2010-05-31
| | | | | | | | 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.mkvGravatar reimar2010-05-31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31295 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31040Gravatar Uoti Urpala2010-04-26
|\|
| * Remove dead code.Gravatar cehoyos2010-04-14
| | | | | | | | | | | | | | Patch by ubitux, ubitux gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31037 b3059339-0415-0410-9bf9-f77b7e298cf2
| * typo fix found by ubituxGravatar compn2010-04-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31035 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r30576Gravatar Uoti Urpala2010-03-09
|\ \
* \ \ Merge svn changes up to r30529Gravatar Uoti Urpala2010-03-09
|\ \ \
* \ \ \ Merge svn changes up to r30475Gravatar Uoti Urpala2010-03-09
|\ \ \ \
| | | | * Mark some more functions that are not used outside of their files as static.Gravatar diego2010-02-18
| | | |/ | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Avoid using sscanf for basic parsing, it is horribly slow.Gravatar reimar2010-02-14
| | |/ | | | | | | | | | | | | | | | | | | Now uses strncmp as a first step, which is 40 times faster. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30576 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Fix subtitle display for DVDs using fade-in/fade-out.Gravatar reimar2010-02-06
| | | | | | | | | | | | | | | | | | | | | | | | This does not do the actual fading, this is not supported by MPlayer, but will just use the highest alpha value used during display. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30524 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Make mkalpha function simpler, faster and more correct.Gravatar reimar2010-02-06
| |/ | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30523 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add license header to all top-level files missing them.Gravatar diego2010-01-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Replace libavutil internal header #includes with MPlayer copiesGravatar Uoti Urpala2009-07-26
| | | | | | | | | | | | Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/ instead.
* | Remove trailing whitespace from most filesGravatar Uoti Urpala2009-07-07
| |
| * whitespace cosmetics: Remove all trailing whitespace.Gravatar diego2009-05-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Gravatar Uoti Urpala2009-01-15
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Simplify and comment spudec bilinear scaling codeGravatar reimar2009-01-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28223 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27841Gravatar Uoti Urpala2008-10-28
|\| | | | | | | | | Conflicts: mplayer.c
| * Factorize vobsub idx/extradata handling.Gravatar aurel2008-10-27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticGravatar Uoti Urpala2008-08-12
| |
* | Merge svn changes up to r26979Gravatar Uoti Urpala2008-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * cosmetics: Remove useless parentheses from return statements.Gravatar diego2008-05-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2