diff options
Diffstat (limited to 'libavfilter/vf_pixdesctest.c')
| -rw-r--r-- | libavfilter/vf_pixdesctest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index e3b4cfa6bf..74a41633a6 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2009 Stefano Sabatini * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -79,7 +79,7 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) /* copy palette */ if (priv->pix_desc->flags & PIX_FMT_PAL || priv->pix_desc->flags & PIX_FMT_PSEUDOPAL) - memcpy(outpicref->data[1], outpicref->data[1], 256*4); + memcpy(outpicref->data[1], picref->data[1], AVPALETTE_SIZE); for_next_filter = avfilter_ref_buffer(outpicref, ~0); if (for_next_filter) @@ -110,7 +110,7 @@ static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) for (i = y1; i < y1 + h1; i++) { av_read_image_line(priv->line, - inpic->data, + (void*)inpic->data, inpic->linesize, priv->pix_desc, 0, i, c, w1, 0); |