diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /libmpcodecs/vf_scale.c | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'libmpcodecs/vf_scale.c')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 10c28ab79b..0daa23c605 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -114,6 +114,7 @@ static int config(struct vf_instance* vf, int vo_flags; int int_sws_flags=0; int round_w=0, round_h=0; + int i; SwsFilter *srcFilter, *dstFilter; enum PixelFormat dfmt, sfmt; @@ -250,7 +251,6 @@ static int config(struct vf_instance* vf, switch(best){ case IMGFMT_RGB8: { /* set 332 palette for 8 bpp */ - int i; vf->priv->palette=malloc(4*256); for(i=0; i<256; i++){ vf->priv->palette[4*i+0]=4*(i>>6)*21; @@ -261,7 +261,6 @@ static int config(struct vf_instance* vf, break; } case IMGFMT_BGR8: { /* set 332 palette for 8 bpp */ - int i; vf->priv->palette=malloc(4*256); for(i=0; i<256; i++){ vf->priv->palette[4*i+0]=4*(i&3)*21; @@ -272,7 +271,6 @@ static int config(struct vf_instance* vf, break; } case IMGFMT_BGR4: case IMGFMT_BG4B: { - int i; vf->priv->palette=malloc(4*16); for(i=0; i<16; i++){ vf->priv->palette[4*i+0]=4*(i&1)*63; @@ -283,7 +281,6 @@ static int config(struct vf_instance* vf, break; } case IMGFMT_RGB4: case IMGFMT_RG4B: { - int i; vf->priv->palette=malloc(4*16); for(i=0; i<16; i++){ vf->priv->palette[4*i+0]=4*(i>>3)*63; |