diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-22 03:50:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-22 03:54:30 +0200 |
| commit | 8772156be0725fd20d948a855616fe155fafdc09 (patch) | |
| tree | 35a59d27786b602b70c98fd1b9c41ab6b47e95cf /libavcodec/utils.c | |
| parent | 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32 (diff) | |
| parent | b4a53314f115a47567b77004e02dd317e0e29ad9 (diff) | |
| download | ffmpeg-8772156be0725fd20d948a855616fe155fafdc09.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
Introduce slice threads flag.
FATE: allow forcing thread-type when doing threaded fate runs.
Use av_log_ask_for_sample() where appropriate.
error: sort, pack, and align error code and string definitions
The stabilization period after version bumps should be one month, not one week.
applehttp: Expose the stream bitrate via metadata
doc: Add some initial docs on the applehttp demuxer
Provide a fallback version of the libm function trunc
libavdevice: Define _XOPEN_SOURCE for usleep
lavc: provide deprecated avcodec_thread_init until next major version
lavc: provide the opt.h header until the next bump
error: change AVERROR_EOF value
error: remove AVERROR_NUMEXPECTED
error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c
Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 47b752a794..ec3f4b965b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1295,3 +1295,11 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field) } #endif + +#if FF_API_THREAD_INIT +int avcodec_thread_init(AVCodecContext *s, int thread_count) +{ + s->thread_count = thread_count; + return ff_thread_init(s); +} +#endif |