Browse Source

lavc: remove disabled FF_API_THREAD_INIT cruft.

tags/n0.11
Anton Khirnov 14 years ago
parent
commit
9a79bb552a
3 changed files with 0 additions and 19 deletions
  1. +0
    -8
      libavcodec/avcodec.h
  2. +0
    -8
      libavcodec/utils.c
  3. +0
    -3
      libavcodec/version.h

+ 0
- 8
libavcodec/avcodec.h View File

@@ -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);

#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_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
//FIXME func typedef


+ 0
- 8
libavcodec/utils.c View File

@@ -1810,14 +1810,6 @@ 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

enum AVMediaType avcodec_get_type(enum CodecID codec_id)
{
if (codec_id <= CODEC_ID_NONE)


+ 0
- 3
libavcodec/version.h View File

@@ -41,9 +41,6 @@
#ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_THREAD_INIT
#define FF_API_THREAD_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_OLD_FF_PICT_TYPES
#define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
#endif


Loading…
Cancel
Save