[FFmpeg-devel] [PATCH 2/2] avutil/imgutils: only align the palette in av_image_copy_to_buffer() if there is enough space

[Stefano Sabatini]

On date Saturday 2016-02-13 15:32:58 +0100, Michael Niedermayer encoded:
> This allows disabling the alignment by using a compact buffer
> 
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavutil/imgutils.c |    5 +++++
>  libavutil/version.h  |    2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
> index 5c28703..adf6fdd 100644
> --- a/libavutil/imgutils.c
> +++ b/libavutil/imgutils.c
> @@ -385,6 +385,7 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
>      int i, j, nb_planes = 0, linesize[4];
>      int size = av_image_get_buffer_size(pix_fmt, width, height, align);
>      const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
> +    uint8_t *orig_dst = dst;
>  
>      if (size > dst_size || size < 0 || !desc)
>          return AVERROR(EINVAL);
> @@ -409,6 +410,10 @@ int av_image_copy_to_buffer(uint8_t *dst, int dst_size,
>  

>      if (desc->flags & AV_PIX_FMT_FLAG_PAL) {
>          uint32_t *d32 = (uint32_t *)(((size_t)dst + 3) & ~3);
> +
> +        if (dst_size - 1024 < (uint8_t*)d32 - orig_dst)
> +            d32 = (uint32_t *)dst;
> +

Do you have a specific use case for this?

[...]

LGTM. 
-- 
FFmpeg = Foolish and Forgiving Merciless Pure Evil Gnome