diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:21:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 22:21:17 +0200 |
| commit | c180f0f6d3981a93242c3ecabd6667434434ea03 (patch) | |
| tree | 30421a92eaabe01553c60ef650f1d37b00c06d96 | |
| parent | 9ba1c62775ca542aa71789de686170dbac609bc8 (diff) | |
| parent | eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8 (diff) | |
| download | ffmpeg-c180f0f6d3981a93242c3ecabd6667434434ea03.tar.gz | |
Merge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'
* commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8':
libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libx264.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 72a07169af..d81721c5f7 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -307,8 +307,10 @@ static av_cold int X264_close(AVCodecContext *avctx) av_freep(&avctx->extradata); av_freep(&x4->sei); - if (x4->enc) + if (x4->enc) { x264_encoder_close(x4->enc); + x4->enc = NULL; + } av_frame_free(&avctx->coded_frame); @@ -889,6 +891,8 @@ AVCodec ff_libx264_encoder = { .priv_class = &x264_class, .defaults = x264_defaults, .init_static_data = X264_init_static, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, }; AVCodec ff_libx264rgb_encoder = { |