On 10/27/2013 06:10 AM, Anton Khirnov wrote:
> ---
>  libavcodec/sunrast.c |   10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
> index 4147cf0..ffa685c 100644
> --- a/libavcodec/sunrast.c
> +++ b/libavcodec/sunrast.c
> @@ -61,10 +61,6 @@ static int sunrast_decode_frame(AVCodecContext *avctx, 
> void *data,
>          av_log(avctx, AV_LOG_ERROR, "invalid (compression) type\n");
>          return AVERROR_INVALIDDATA;
>      }
> -    if (av_image_check_size(w, h, 0, avctx)) {
> -        av_log(avctx, AV_LOG_ERROR, "invalid image size\n");
> -        return AVERROR_INVALIDDATA;
> -    }
>      if (maptype == RMT_RAW) {
>          avpriv_request_sample(avctx, "Unknown colormap type");
>          return AVERROR_PATCHWELCOME;
> @@ -90,8 +86,10 @@ static int sunrast_decode_frame(AVCodecContext *avctx, 
> void *data,
>              return AVERROR_INVALIDDATA;
>      }
>  
> -    if (w != avctx->width || h != avctx->height)
> -        avcodec_set_dimensions(avctx, w, h);
> +    ret = ff_set_dimensions(avctx, w, h);
> +    if (ret < 0)
> +        return ret;
> +
>      if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
>          av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
>          return ret;

Ok

-Justin

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to