diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-20 17:21:39 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-21 07:22:23 +0200 |
| commit | 65af48b55930abe5ac9130be3ff4d9c287a7f010 (patch) | |
| tree | b713e980efde65987d71bf9b6433411d400d633f | |
| parent | 095290f9a4230698f64c56b5ee9d89c046f6dd5b (diff) | |
| download | ffmpeg-65af48b55930abe5ac9130be3ff4d9c287a7f010.tar.gz | |
lavc: provide deprecated avcodec_thread_init until next major version
It was deprecated only recently.
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/utils.c | 8 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 19 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 40d3b2245b..7727ad08bf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3577,6 +3577,14 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt); +#if FF_API_THREAD_INIT +/** + * @deprecated Set s->thread_count before calling avcodec_open() instead of calling this. + */ +attribute_deprecated +int avcodec_thread_init(AVCodecContext *s, int thread_count); +#endif + int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); //FIXME func typedef diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0190e6652c..744e0ada87 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1220,3 +1220,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 diff --git a/libavcodec/version.h b/libavcodec/version.h index 92f9e58ffa..b9c219d260 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -65,5 +65,8 @@ #ifndef FF_API_OPT_H #define FF_API_OPT_H (LIBAVCODEC_VERSION_MAJOR < 54) #endif +#ifndef FF_API_THREAD_INIT +#define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54) +#endif #endif /* AVCODEC_VERSION_H */ |