diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-06 23:54:50 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-06 23:54:50 +0000 |
| commit | 9d385cfec45145eb0bd141120bdcae56a4e5660b (patch) | |
| tree | 5eca141b2868fb309f00c5b52c0b6bff2366370e | |
| parent | 9be26823b90f975f27c17ec917e5bd0a74f825a1 (diff) | |
| download | ffmpeg-9d385cfec45145eb0bd141120bdcae56a4e5660b.tar.gz | |
Drop the deprecated function register_avcodec() at the next major
version bump.
Originally committed as revision 17028 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ea095c97c6..c39355ef02 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2604,10 +2604,12 @@ unsigned avcodec_version(void); */ void avcodec_init(void); +#if LIBAVCODEC_VERSION_MAJOR < 53 /** * @deprecated Deprecated in favor of avcodec_register(). */ attribute_deprecated void register_avcodec(AVCodec *codec); +#endif /** * Register the codec \p codec and initialize libavcodec. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4f35f759c0..b1579aec3b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -98,10 +98,12 @@ void avcodec_register(AVCodec *codec) codec->next = NULL; } +#if LIBAVCODEC_VERSION_MAJOR < 53 void register_avcodec(AVCodec *codec) { avcodec_register(codec); } +#endif void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ s->coded_width = width; |