generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/libx264: Remove cleanup code, its uneeded since FF_CODEC_CAP_INIT_CLEANUP

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-24 22:46:06 +02:00
parent e80b2b9c81
commit 8a710ddc7c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libx264.c
View File

@ -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[] = {