OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7086be
)
avcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_ch...
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 7 Sep 2014 10:52:24 +0000
(12:52 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Nov 2014 17:44:37 +0000
(18:44 +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
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
84e32b4
..
f3c7ea5
100644
(file)
--- a/
libavcodec/mpegvideo.c
+++ b/
libavcodec/mpegvideo.c
@@
-1214,7
+1214,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;