diff options
Diffstat (limited to 'libavcodec/avpicture.c')
| -rw-r--r-- | libavcodec/avpicture.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libavcodec/avpicture.c b/libavcodec/avpicture.c index 786d740abd..56435f4fc9 100644 --- a/libavcodec/avpicture.c +++ b/libavcodec/avpicture.c @@ -2,20 +2,20 @@ * AVPicture management routines * Copyright (c) 2001, 2002, 2003 Fabrice Bellard * - * 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 */ @@ -34,19 +34,18 @@ #if FF_API_AVPICTURE FF_DISABLE_DEPRECATION_WARNINGS -int avpicture_fill(AVPicture *picture, uint8_t *ptr, +int avpicture_fill(AVPicture *picture, const uint8_t *ptr, enum AVPixelFormat pix_fmt, int width, int height) { return av_image_fill_arrays(picture->data, picture->linesize, ptr, pix_fmt, width, height, 1); } -int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, - int width, int height, +int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, int width, int height, unsigned char *dest, int dest_size) { return av_image_copy_to_buffer(dest, dest_size, - src->data, src->linesize, + (const uint8_t * const*)src->data, src->linesize, pix_fmt, width, height, 1); } @@ -70,13 +69,13 @@ int avpicture_alloc(AVPicture *picture, void avpicture_free(AVPicture *picture) { - av_free(picture->data[0]); + av_freep(&picture->data[0]); } void av_picture_copy(AVPicture *dst, const AVPicture *src, enum AVPixelFormat pix_fmt, int width, int height) { - av_image_copy(dst->data, dst->linesize, src->data, + av_image_copy(dst->data, dst->linesize, (const uint8_t **)src->data, src->linesize, pix_fmt, width, height); } FF_ENABLE_DEPRECATION_WARNINGS |