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

Remove unnecessary parameter from ff_thread_init() and fix behavior

Browse Source 
thread_count passed to ff_thread_init() is only used to set AVCodecContext.
thread_count, and can be removed. Instead move it to the legacy implementation
of avcodec_thread_init().

This also fixes the problem that calling avcodec_thread_init() with pthreads
enabled did not set it since ff1efc524c.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
This commit is contained in:
Alexander Strange
2011-03-29 17:18:21 -04:00
committed by Janne Grunau
parent d6f66edd65
commit ba9ef8d04e
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/utils.c
View File

@ -539,7 +539,7 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)
avctx->frame_number = 0;
if (HAVE_THREADS && !avctx->thread_opaque) {
ret = ff_thread_init(avctx, avctx->thread_count);
ret = ff_thread_init(avctx);
if (ret < 0) {
goto free_and_end;
}
@ -1147,8 +1147,7 @@ int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt) {
#endif
#if !HAVE_THREADS
int ff_thread_init(AVCodecContext *s, int thread_count){
s->thread_count = thread_count;
int ff_thread_init(AVCodecContext *s){
return -1;
}
#endif
@ -1291,7 +1290,8 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field)
int avcodec_thread_init(AVCodecContext *s, int thread_count)
{
return ff_thread_init(s, thread_count);
s->thread_count = thread_count;
return ff_thread_init(s);
}
void avcodec_thread_free(AVCodecContext *s)