From 02beb9826b29166b5d7c9b306ac1648abb449be0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 27 Feb 2012 18:52:13 +0100 Subject: lavc: deprecate AVCodecContext.sub_id. In most places where it's used, it's as a pointless write-only field. Only rv10 decoder actually reads from it, but it stores some internal version info in it. There is no reason for it to be in a public field. --- libavcodec/version.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavcodec/version.h') diff --git a/libavcodec/version.h b/libavcodec/version.h index f3b40ca511..6fbe01c3a8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -59,5 +59,8 @@ #ifndef FF_API_INTER_THRESHOLD #define FF_API_INTER_THRESHOLD (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_SUB_ID +#define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ -- cgit v1.2.3 From 44fe77b350fd812c84cd866b7d03e436acc3bab2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 2 Mar 2012 17:00:53 +0100 Subject: lavc: make codec_is_decoder/encoder() public. --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 10 ++++++++++ libavcodec/utils.c | 18 +++++++++--------- libavcodec/version.h | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) (limited to 'libavcodec/version.h') diff --git a/doc/APIchanges b/doc/APIchanges index 00cee5ad90..ef630e8e2a 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -12,6 +12,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-03-xx - xxxxxxx - lavc 54.7.0 - avcodec.h + Add av_codec_is_encoder/decoder(). + 2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h Add av_packet_shrink_side_data. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 491fb16a70..a99dcbd553 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4297,4 +4297,14 @@ const AVClass *avcodec_get_class(void); */ int avcodec_is_open(AVCodecContext *s); +/** + * @return a non-zero number if codec is an encoder, zero otherwise + */ +int av_codec_is_encoder(AVCodec *codec); + +/** + * @return a non-zero number if codec is a decoder, zero otherwise + */ +int av_codec_is_decoder(AVCodec *codec); + #endif /* AVCODEC_AVCODEC_H */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f9927a1383..d4384108df 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -112,12 +112,12 @@ static void avcodec_init(void) ff_dsputil_static_init(); } -static av_always_inline int codec_is_encoder(AVCodec *codec) +int av_codec_is_encoder(AVCodec *codec) { return codec && (codec->encode || codec->encode2); } -static av_always_inline int codec_is_decoder(AVCodec *codec) +int av_codec_is_decoder(AVCodec *codec) { return codec && codec->decode; } @@ -704,7 +704,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD /* if the decoder init function was already called previously, free the already allocated subtitle_header before overwriting it */ - if (codec_is_decoder(codec)) + if (av_codec_is_decoder(codec)) av_freep(&avctx->subtitle_header); #define SANE_NB_CHANNELS 128U @@ -748,7 +748,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD ret = AVERROR(EINVAL); goto free_and_end; } - if (codec_is_encoder(avctx->codec)) { + if (av_codec_is_encoder(avctx->codec)) { int i; if (avctx->codec->sample_fmts) { for (i = 0; avctx->codec->sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++) @@ -1367,7 +1367,7 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_opt_free(avctx->priv_data); av_opt_free(avctx); av_freep(&avctx->priv_data); - if (codec_is_encoder(avctx->codec)) + if (av_codec_is_encoder(avctx->codec)) av_freep(&avctx->extradata); avctx->codec = NULL; avctx->active_thread_type = 0; @@ -1385,7 +1385,7 @@ AVCodec *avcodec_find_encoder(enum CodecID id) AVCodec *p, *experimental=NULL; p = first_avcodec; while (p) { - if (codec_is_encoder(p) && p->id == id) { + if (av_codec_is_encoder(p) && p->id == id) { if (p->capabilities & CODEC_CAP_EXPERIMENTAL && !experimental) { experimental = p; } else @@ -1403,7 +1403,7 @@ AVCodec *avcodec_find_encoder_by_name(const char *name) return NULL; p = first_avcodec; while (p) { - if (codec_is_encoder(p) && strcmp(name,p->name) == 0) + if (av_codec_is_encoder(p) && strcmp(name,p->name) == 0) return p; p = p->next; } @@ -1415,7 +1415,7 @@ AVCodec *avcodec_find_decoder(enum CodecID id) AVCodec *p; p = first_avcodec; while (p) { - if (codec_is_decoder(p) && p->id == id) + if (av_codec_is_decoder(p) && p->id == id) return p; p = p->next; } @@ -1429,7 +1429,7 @@ AVCodec *avcodec_find_decoder_by_name(const char *name) return NULL; p = first_avcodec; while (p) { - if (codec_is_decoder(p) && strcmp(name,p->name) == 0) + if (av_codec_is_decoder(p) && strcmp(name,p->name) == 0) return p; p = p->next; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 6fbe01c3a8..1ecfb215f6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 6 +#define LIBAVCODEC_VERSION_MINOR 7 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- cgit v1.2.3