diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-09-01 16:59:35 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-21 13:51:53 +0200 |
| commit | 9ecfbb3e57dc1d46986b9296bf582c8e82b303b6 (patch) | |
| tree | b35235632a34ef4b819f942ae3327daeda65fde7 | |
| parent | e5b29c1f6b5cd17ba4f0a976a535c4003a07eb02 (diff) | |
| download | ffmpeg-9ecfbb3e57dc1d46986b9296bf582c8e82b303b6.tar.gz | |
lavc/utils: move avcodec_init() higher in the file.
Fixes build on next major bump.
| -rw-r--r-- | libavcodec/utils.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 166fbec607..9f198cb32a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -85,6 +85,20 @@ AVCodec *av_codec_next(AVCodec *c){ else return first_avcodec; } +#if !FF_API_AVCODEC_INIT +static +#endif +void avcodec_init(void) +{ + static int initialized = 0; + + if (initialized != 0) + return; + initialized = 1; + + dsputil_static_init(); +} + void avcodec_register(AVCodec *codec) { AVCodec **p; @@ -1065,20 +1079,6 @@ const char *avcodec_license(void) return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1; } -#if !FF_API_AVCODEC_INIT -static -#endif -void avcodec_init(void) -{ - static int initialized = 0; - - if (initialized != 0) - return; - initialized = 1; - - dsputil_static_init(); -} - void avcodec_flush_buffers(AVCodecContext *avctx) { if(HAVE_PTHREADS && avctx->active_thread_type&FF_THREAD_FRAME) |