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

Merge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'

Browse Source 
* commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8':
  libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-24 22:21:12 +02:00
commit c180f0f6d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libx264.c
View File

@ -307,8 +307,10 @@ static av_cold int X264_close(AVCodecContext *avctx)
av_freep(&avctx->extradata); av_freep(&avctx->extradata);
av_freep(&x4->sei); av_freep(&x4->sei);
if (x4->enc) if (x4->enc) {
x264_encoder_close(x4->enc); x264_encoder_close(x4->enc);
x4->enc = NULL;
}
av_frame_free(&avctx->coded_frame); av_frame_free(&avctx->coded_frame);
@ -889,6 +891,8 @@ AVCodec ff_libx264_encoder = {
.priv_class = &x264_class, .priv_class = &x264_class,
.defaults = x264_defaults, .defaults = x264_defaults,
.init_static_data = X264_init_static, .init_static_data = X264_init_static,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP,
}; };
AVCodec ff_libx264rgb_encoder = { AVCodec ff_libx264rgb_encoder = {