stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

transcoding: avoid resetting thread_count to default value (zero).

Browse source
This commit is contained in:
John Törblom 2013-07-17 17:31:33 +02:00
parent 2f3e37232d
commit 36d27047dd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/plumbing/transcoding.c
View file

@ -948,12 +948,12 @@ transcoder_init_audio(transcoder_t *t, streaming_start_component_t *ssc)
as->aud_ictx->codec_type = AVMEDIA_TYPE_AUDIO;
as->aud_octx->codec_type = AVMEDIA_TYPE_AUDIO;
as->aud_ictx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
as->aud_octx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
avcodec_get_context_defaults3(as->aud_ictx, icodec);
avcodec_get_context_defaults3(as->aud_octx, ocodec);
as->aud_ictx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
as->aud_octx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
as->aud_ictx->codec_type = AVMEDIA_TYPE_AUDIO;
as->aud_octx->codec_type = AVMEDIA_TYPE_AUDIO;
@ -1055,12 +1055,12 @@ transcoder_init_video(transcoder_t *t, streaming_start_component_t *ssc)
vs->vid_ictx = avcodec_alloc_context();
vs->vid_octx = avcodec_alloc_context();
vs->vid_ictx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
vs->vid_octx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
avcodec_get_context_defaults3(vs->vid_ictx, icodec);
avcodec_get_context_defaults3(vs->vid_octx, ocodec);
vs->vid_ictx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
vs->vid_octx->thread_count = sysconf(_SC_NPROCESSORS_ONLN);
vs->vid_dec_frame = avcodec_alloc_frame();
vs->vid_enc_frame = avcodec_alloc_frame();