mirror of https://git.videolan.org/git/ffmpeg.git
lavc: remove disabled FF_API_THREAD_INIT cruft.
This commit is contained in:
parent
7831a7e4ec
commit
9a79bb552a
|
@ -3726,14 +3726,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
|
||||||
|
|
||||||
enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
|
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_open2() 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_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);
|
int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
|
||||||
//FIXME func typedef
|
//FIXME func typedef
|
||||||
|
|
|
@ -1810,14 +1810,6 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field)
|
||||||
|
|
||||||
#endif
|
#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
|
|
||||||
|
|
||||||
enum AVMediaType avcodec_get_type(enum CodecID codec_id)
|
enum AVMediaType avcodec_get_type(enum CodecID codec_id)
|
||||||
{
|
{
|
||||||
if (codec_id <= CODEC_ID_NONE)
|
if (codec_id <= CODEC_ID_NONE)
|
||||||
|
|
|
@ -41,9 +41,6 @@
|
||||||
#ifndef FF_API_REQUEST_CHANNELS
|
#ifndef FF_API_REQUEST_CHANNELS
|
||||||
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
|
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_THREAD_INIT
|
|
||||||
#define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_OLD_FF_PICT_TYPES
|
#ifndef FF_API_OLD_FF_PICT_TYPES
|
||||||
#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
|
#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue