Commit 1639cbff authored by stefano's avatar stefano

Rename register_avcodec() as avcodec_register() and deprecate the old

function name.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17026 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 073c4982
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 13 #define LIBAVCODEC_VERSION_MINOR 14
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...@@ -2604,12 +2604,17 @@ unsigned avcodec_version(void); ...@@ -2604,12 +2604,17 @@ unsigned avcodec_version(void);
*/ */
void avcodec_init(void); void avcodec_init(void);
/**
* @deprecated Deprecated in favor of avcodec_register().
*/
attribute_deprecated void register_avcodec(AVCodec *codec);
/** /**
* Register the codec \p codec and initialize libavcodec. * Register the codec \p codec and initialize libavcodec.
* *
* @see avcodec_init() * @see avcodec_init()
*/ */
void register_avcodec(AVCodec *codec); void avcodec_register(AVCodec *codec);
/** /**
* Finds a registered encoder with a matching codec ID. * Finds a registered encoder with a matching codec ID.
......
...@@ -88,7 +88,7 @@ AVCodec *av_codec_next(AVCodec *c){ ...@@ -88,7 +88,7 @@ AVCodec *av_codec_next(AVCodec *c){
else return first_avcodec; else return first_avcodec;
} }
void register_avcodec(AVCodec *codec) void avcodec_register(AVCodec *codec)
{ {
AVCodec **p; AVCodec **p;
avcodec_init(); avcodec_init();
...@@ -98,6 +98,11 @@ void register_avcodec(AVCodec *codec) ...@@ -98,6 +98,11 @@ void register_avcodec(AVCodec *codec)
codec->next = NULL; codec->next = NULL;
} }
void register_avcodec(AVCodec *codec)
{
avcodec_register(codec);
}
void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ void avcodec_set_dimensions(AVCodecContext *s, int width, int height){
s->coded_width = width; s->coded_width = width;
s->coded_height= height; s->coded_height= height;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment