avcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_ch...
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 10:52:24 +0000 (12:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Dec 2014 03:40:03 +0000 (04:40 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2762323c37511fbbc98b164c07620b9ebc59ec68)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c

index 566c0d2..37da6e5 100644 (file)
@@ -1063,7 +1063,7 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s)
 
     if ((s->width || s->height) &&
         av_image_check_size(s->width, s->height, 0, s->avctx))
-        return AVERROR_INVALIDDATA;
+        goto fail;
 
     if ((err = init_context_frame(s)))
         goto fail;