aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-05 18:31:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-05 18:31:18 +0200
commit8267f0f7aebba2459b349849bf9876d53e127e15 (patch)
treebc7096d130aa15d3718482dd615dbfdacb207d25
parent5666a1b270ffffb2f7d5485b9176758cab399df5 (diff)
downloadffmpeg-8267f0f7aebba2459b349849bf9876d53e127e15.tar.gz
vf_scale: fix incompatible pointer type warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/vf_scale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index eda1b1fe1a..49988bfbd8 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -318,7 +318,7 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
outpicref->video->h = outlink->h;
if(scale->output_is_pal)
- ff_set_systematic_pal2(outpicref->data[1], outlink->format == PIX_FMT_PAL8 ? PIX_FMT_BGR8 : outlink->format);
+ ff_set_systematic_pal2((uint32_t*)outpicref->data[1], outlink->format == PIX_FMT_PAL8 ? PIX_FMT_BGR8 : outlink->format);
av_reduce(&outpicref->video->sample_aspect_ratio.num, &outpicref->video->sample_aspect_ratio.den,
(int64_t)picref->video->sample_aspect_ratio.num * outlink->h * link->w,