highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate avcodec_thread_init()

Browse Source 
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03)
This commit is contained in:
Alexander Strange
2011-02-07 21:15:45 -05:00
committed by Michael Niedermayer
parent 03e3cb8777
commit 043d2ff267
8 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/utils.c
View File

@@ -540,7 +540,7 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
avctx->frame_number = 0;
if (HAVE_THREADS && !avctx->thread_opaque) {
ret = avcodec_thread_init(avctx, avctx->thread_count);
ret = ff_thread_init(avctx, avctx->thread_count);
if (ret < 0) {
goto free_and_end;
}
@@ -819,7 +819,7 @@ av_cold int avcodec_close(AVCodecContext *avctx)
}
if (HAVE_THREADS && avctx->thread_opaque)
avcodec_thread_free(avctx);
ff_thread_free(avctx);
if (avctx->codec && avctx->codec->close)
avctx->codec->close(avctx);
avcodec_default_free_buffers(avctx);
@@ -1180,7 +1180,7 @@ int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt) {
#endif
#if !HAVE_THREADS
int avcodec_thread_init(AVCodecContext *s, int thread_count){
int ff_thread_init(AVCodecContext *s, int thread_count){
s->thread_count = thread_count;
return -1;
}
@@ -1319,3 +1319,17 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field)
}
#endif
#if LIBAVCODEC_VERSION_MAJOR < 53
int avcodec_thread_init(AVCodecContext *s, int thread_count)
{
return ff_thread_init(s, thread_count);
}
void avcodec_thread_free(AVCodecContext *s)
{
return ff_thread_free(s);
}
#endif