diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-06 23:46:15 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-02-06 23:46:15 +0000 |
| commit | 85662f4935e1a0ff657162acaf1a707250271c53 (patch) | |
| tree | 4cbcb2cfb14f3d95a9d4ac65dc3ae5fb22b7c2e7 | |
| parent | 21eff9ced790c4b8c697837213e7fc7aa44be62b (diff) | |
| download | ffmpeg-85662f4935e1a0ff657162acaf1a707250271c53.tar.gz | |
Rename register_avcodec() as avcodec_register() and deprecate the old
function name.
Originally committed as revision 17026 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/utils.c | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3f8a3d4a09..0c1902ae71 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 13 +#define LIBAVCODEC_VERSION_MINOR 14 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -2605,11 +2605,16 @@ unsigned avcodec_version(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. * * @see avcodec_init() */ -void register_avcodec(AVCodec *codec); +void avcodec_register(AVCodec *codec); /** * Finds a registered encoder with a matching codec ID. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 26ce057e3c..4f35f759c0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -88,7 +88,7 @@ AVCodec *av_codec_next(AVCodec *c){ else return first_avcodec; } -void register_avcodec(AVCodec *codec) +void avcodec_register(AVCodec *codec) { AVCodec **p; avcodec_init(); @@ -98,6 +98,11 @@ void register_avcodec(AVCodec *codec) codec->next = NULL; } +void register_avcodec(AVCodec *codec) +{ + avcodec_register(codec); +} + void avcodec_set_dimensions(AVCodecContext *s, int width, int height){ s->coded_width = width; s->coded_height= height; |