diff options
| author | siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-01 19:35:16 +0000 |
|---|---|---|
| committer | siretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-01 19:35:16 +0000 |
| commit | b2dc062825e0761dd7eaa93f7d7698843657f4d0 (patch) | |
| tree | 7e8b833605928ad97b4de894b33015ee5a3d62bd /libmpcodecs | |
| parent | cf9c1948f84b0519a99fd0b2212c7cb53acbe965 (diff) | |
| download | mpv-b2dc062825e0761dd7eaa93f7d7698843657f4d0.tar.bz2 mpv-b2dc062825e0761dd7eaa93f7d7698843657f4d0.tar.xz | |
deprecate palette8topacked32 in favor of public API functions 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
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_palette.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libmpcodecs/vf_palette.c b/libmpcodecs/vf_palette.c index 44a4756121..918e32cacb 100644 --- a/libmpcodecs/vf_palette.c +++ b/libmpcodecs/vf_palette.c @@ -29,6 +29,7 @@ #include "mp_image.h" #include "vf.h" +#include "libswscale/swscale.h" #include "libswscale/rgb2rgb.h" //===========================================================================// @@ -122,15 +123,15 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ break; case 24: if (IMGFMT_IS_BGR(dmpi->imgfmt)) - palette8topacked24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); else - palette8topacked24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); break; case 32: if (IMGFMT_IS_BGR(dmpi->imgfmt)) - palette8topacked32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); else - palette8topacked32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]); break; } } else { @@ -148,15 +149,15 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ break; case 24: if (IMGFMT_IS_BGR(dmpi->imgfmt)) - palette8topacked24(src,dst,mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked24(src,dst,mpi->w,mpi->planes[1]); else - palette8topacked24(src,dst,mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked24(src,dst,mpi->w,mpi->planes[1]); break; case 32: if (IMGFMT_IS_BGR(dmpi->imgfmt)) - palette8topacked32(src,dst,mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked32(src,dst,mpi->w,mpi->planes[1]); else - palette8topacked32(src,dst,mpi->w,mpi->planes[1]); + sws_convertPalette8ToPacked32(src,dst,mpi->w,mpi->planes[1]); break; } } |