diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:46:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 17:23:20 +0200 |
| commit | 8a710ddc7c111b43cd32a4e523fc2dafd53a0592 (patch) | |
| tree | bceb515fc3a338f3b8c3d7e2f63df3b29a49ba17 /libavcodec/libx264.c | |
| parent | e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3 (diff) | |
| download | ffmpeg-8a710ddc7c111b43cd32a4e523fc2dafd53a0592.tar.gz | |
avcodec/libx264: Remove cleanup code, its uneeded since FF_CODEC_CAP_INIT_CLEANUP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d81721c5f7..82c4f2e2f8 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[] = { |