1
mirror of https://github.com/mpv-player/mpv synced 2024-11-03 03:19:24 +01:00
mpv/libmpcodecs
wm4 ffb7a2fe17 sub: create sub_bitmap array even when using libass
One sub_bitmaps struct could contain either a libass ASS_Image list, or
a mplayer native list of sub-bitmaps. This caused code duplication in
vo_vdpau.c and bitmap_packer.c.

Avoid this by creating such a sub_bitmap array even with libass. This
basically copies the list and recreates it in mplayer's native format.
It gets rid of the code duplication, and will make implementing extended
subtitle and OSD rendering in other VOs easier.

Also do some cosmetic changes and other preparations for the following
commits.
2012-10-16 07:26:28 +02:00
..
ad_dvdpcm.c ad_dvdpcm: add back PCM decoder for DVD 2012-09-18 21:08:14 +02:00
ad_ffmpeg.c ad_ffmpeg: add sanity check against decoder overreads 2012-08-16 17:16:33 +02:00
ad_internal.h libaf: rename af_format.h to format.h 2012-08-29 00:50:26 +02:00
ad_mpg123.c cleanup: remove pointless #defines 2012-09-18 21:04:46 +02:00
ad_pcm.c rawaudio: use mplayer audio format for format option 2012-09-18 21:07:29 +02:00
ad_spdif.c libmpcodecs: add ad_spdif.c, S/PDIF passthrough decoder 2012-08-03 01:30:08 +02:00
ad.c ad_dvdpcm: add back PCM decoder for DVD 2012-09-18 21:08:14 +02:00
ad.h cosmetics: vf.[ch]: reformat 2011-11-14 20:24:36 +02:00
cmmx.h Add missing license headers to all files in the libmpcodecs directory. 2010-01-30 16:57:40 +00:00
dec_audio.c dec_audio: do not overwrite sh_audio->wf->wFormatTag 2012-09-18 21:06:40 +02:00
dec_audio.h audio: move ready-for-ao data buffer from decoder to AO 2011-07-02 09:22:32 +03:00
dec_video.c vf_rectangle: remove as it is very dirty and we have a replacement now 2012-09-18 21:08:20 +02:00
dec_video.h vf_rectangle: remove as it is very dirty and we have a replacement now 2012-09-18 21:08:20 +02:00
img_format.c options, codecs.conf, img_format: unify imgfmt name handling 2012-08-29 00:14:11 +02:00
img_format.h options, codecs.conf, img_format: unify imgfmt name handling 2012-08-29 00:14:11 +02:00
mp_image.c libmpcodecs: add support for 422P9 2012-08-03 01:43:03 +02:00
mp_image.h mpcodecs: remove mp_image_t.x/y 2012-02-24 15:25:22 +01:00
mpc_info.h video, audio: use lavc decoders without codecs.conf entries 2012-07-24 09:01:47 +03:00
pullup.c Remove dead code 2012-08-01 17:07:35 +02:00
pullup.h Remove dead code 2012-08-01 17:07:35 +02:00
vd_ffmpeg.c demuxer: remove ImageDesc field 2012-09-18 21:04:46 +02:00
vd_internal.h Merge svn changes up to r30463 2010-03-09 18:59:15 +02:00
vd_null.c Merge svn changes up to r30463 2010-03-09 18:59:15 +02:00
vd.c libmpcodecs: remove redundant audio and video decoders 2012-08-20 15:36:04 +02:00
vd.h commands, vd_ffmpeg: fix switch_ratio slave command 2011-11-14 20:24:39 +02:00
vf_1bpp.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_2xsai.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_ass.c subs, vo_vdpau: support RGBA color for PGS subtitles 2012-09-18 21:07:30 +02:00
vf_blackframe.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
vf_bmovl.c cleanup: remove more warnings 2011-05-02 00:46:48 +03:00
vf_boxblur.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_crop.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_cropdetect.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_decimate.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_delogo.c vf_delogo: allow to change the rectangle based on the time 2011-07-06 07:13:08 +03:00
vf_denoise3d.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
vf_detc.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_dint.c vf_dint, vf_divtc: fix code assuming "char" is signed 2011-07-06 09:15:57 +03:00
vf_divtc.c vf_dint, vf_divtc: fix code assuming "char" is signed 2011-07-06 09:15:57 +03:00
vf_dlopen.c vf_dlopen: improve performance for 1-frame-for-1-frame filters 2012-09-18 21:08:20 +02:00
vf_dlopen.h vf_dlopen: add a generic filter to load external filters 2012-08-23 13:13:53 +02:00
vf_down3dright.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_dsize.c vf_dsize, vf_scale: fix behavior on multiple config() calls 2011-12-19 02:02:32 +02:00
vf_dvbscale.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_eq2.c Do not cast the results of malloc/calloc/realloc. 2010-02-26 15:01:37 +00:00
vf_eq.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
vf_expand.c Adjust ffmpeg/libav #includes to work with recent upstream changes 2012-08-21 18:22:00 +02:00
vf_field.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_fil.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_filmdint.c Rip out 3DNOW support 2012-07-30 01:38:14 +02:00
vf_fixpts.c vf_fixpts: Mark vf_info_t declaration const 2010-11-02 04:16:45 +02:00
vf_flip.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_format.c Merge svn changes up to r31332 2010-06-05 23:37:42 +03:00
vf_framestep.c cleanup: remove unused MEncoder-related code 2011-01-25 02:29:31 +02:00
vf_fspp.c vf_spp, vf_fspp: replace use of deprecated libav function 2012-08-03 02:12:37 +02:00
vf_geq.c Adjust ffmpeg/libav #includes to work with recent upstream changes 2012-08-21 18:22:00 +02:00
vf_gradfun.c Adjust ffmpeg/libav #includes to work with recent upstream changes 2012-08-21 18:22:00 +02:00
vf_halfpack.c vf_scale: don't pass CPU flags anymore 2012-07-30 01:38:53 +02:00
vf_harddup.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_hqdn3d.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
vf_hue.c cleanup: remove NULL checks before free() all over the code 2010-11-14 13:11:20 +02:00
vf_il.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_ilpack.c vf_ilpack: fix incompatible function types 2011-07-06 09:24:31 +03:00
vf_ivtc.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_kerndeint.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_lavc.c Update Libav API uses 2012-02-01 22:46:27 +02:00
vf_lavcdeint.c cleanup: do libav* initialization on startup 2011-07-18 00:57:05 +03:00
vf_mcdeint.c cleanup: do libav* initialization on startup 2011-07-18 00:57:05 +03:00
vf_mirror.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_noformat.c Merge svn changes up to r31332 2010-06-05 23:37:42 +03:00
vf_noise.c configure: remove checks for malloc.h and alloca() 2012-07-30 22:14:33 +02:00
vf_ow.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_palette.c Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
vf_perspective.c configure: remove checks for malloc.h and alloca() 2012-07-30 22:14:33 +02:00
vf_phase.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_pp7.c configure: remove checks for malloc.h and alloca() 2012-07-30 22:14:33 +02:00
vf_pp.c configure: remove checks for malloc.h and alloca() 2012-07-30 22:14:33 +02:00
vf_pullup.c Rip out 3DNOW support 2012-07-30 01:38:14 +02:00
vf_qp.c Adjust ffmpeg/libav #includes to work with recent upstream changes 2012-08-21 18:22:00 +02:00
vf_remove_logo.c windows support: unicode filenames 2012-03-09 20:48:54 +02:00
vf_rgbtest.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_rotate.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_sab.c Adjust ffmpeg/libav #includes to work with recent upstream changes 2012-08-21 18:22:00 +02:00
vf_scale.c vf_scale: do the upscale detection AFTER calculating dimensions 2012-09-24 16:41:12 +02:00
vf_scale.h vf_scale: don't pass CPU flags anymore 2012-07-30 01:38:53 +02:00
vf_screenshot.c screenshot: allow forcing taking screenshots with the video filter 2012-02-29 03:41:14 +01:00
vf_smartblur.c vf_scale: don't pass CPU flags anymore 2012-07-30 01:38:53 +02:00
vf_softpulldown.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_softskip.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_spp.c vf_spp, vf_fspp: replace use of deprecated libav function 2012-08-03 02:12:37 +02:00
vf_stereo3d.c vf_stereo3d.c: half-width side-by-side formats for stereo3d 2012-08-03 01:09:18 +02:00
vf_swapuv.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_telecine.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_test.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_tfields.c Rip out 3DNOW support 2012-07-30 01:38:14 +02:00
vf_tile.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_tinterlace.c vf_*: fix pts values passed to the next filter 2011-04-24 03:55:47 +03:00
vf_unsharp.c vf_unsharp: direct rendering fixes 2012-08-03 03:38:45 +02:00
vf_uspp.c Adjust ffmpeg/libav #includes to work with recent upstream changes 2012-08-21 18:22:00 +02:00
vf_vo.c subs, vo_vdpau: support RGBA color for PGS subtitles 2012-09-18 21:07:30 +02:00
vf_yadif.c vf_yadif: fix green bottom line 2012-08-03 01:46:43 +02:00
vf_yuvcsp.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf_yvu9.c cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 2010-05-29 17:20:44 +03:00
vf.c vf_rectangle: remove as it is very dirty and we have a replacement now 2012-09-18 21:08:20 +02:00
vf.h vf_rectangle: remove as it is very dirty and we have a replacement now 2012-09-18 21:08:20 +02:00
vfcap.h sub: create sub_bitmap array even when using libass 2012-10-16 07:26:28 +02:00
vqf.h Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00