ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Apr 24 22:46:06 2015 +0200| [8a710ddc7c111b43cd32a4e523fc2dafd53a0592] | committer: Michael Niedermayer
avcodec/libx264: Remove cleanup code, its uneeded since FF_CODEC_CAP_INIT_CLEANUP Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a710ddc7c111b43cd32a4e523fc2dafd53a0592 --- libavcodec/libx264.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d81721c..82c4f2e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -703,7 +703,7 @@ static av_cold int X264_init(AVCodecContext *avctx) s = x264_encoder_headers(x4->enc, &nal, &nnal); avctx->extradata = p = av_malloc(s); if (!p) - goto nomem; + return AVERROR(ENOMEM); for (i = 0; i < nnal; i++) { /* Don't put the SEI in extradata. */ @@ -712,7 +712,7 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->sei_size = nal[i].i_payload; x4->sei = av_malloc(x4->sei_size); if (!x4->sei) - goto nomem; + return AVERROR(ENOMEM); memcpy(x4->sei, nal[i].p_payload, nal[i].i_payload); continue; } @@ -723,9 +723,6 @@ static av_cold int X264_init(AVCodecContext *avctx) } return 0; -nomem: - X264_close(avctx); - return AVERROR(ENOMEM); } static const enum AVPixelFormat pix_fmts_8bit[] = { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
