Drop the deprecated function register_avcodec() at the next major

version bump.

Originally committed as revision 17028 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ea095c9..c39355e 100644 (file)
--- 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 4f35f75..b1579ae 100644 (file)
--- 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;