diff options
| author | Josh de Kock <josh@itanimul.li> | 2020-04-14 13:33:01 +0100 |
|---|---|---|
| committer | Josh de Kock <josh@itanimul.li> | 2020-04-20 15:08:20 +0000 |
| commit | bd2e7b74e1ed1bb050cabc46925ba65f6d87d351 (patch) | |
| tree | aa2dd49b137d76c21e175f23d9b7c018f4d33120 | |
| parent | 4cde83c780761b1f611d130285a5aee47d0be657 (diff) | |
| download | ffmpeg-bd2e7b74e1ed1bb050cabc46925ba65f6d87d351.tar.gz | |
lavc: stop using deprecated av_codec_next()
Signed-off-by: Josh de Kock <josh@itanimul.li>
| -rw-r--r-- | libavcodec/options.c | 7 | ||||
| -rw-r--r-- | libavcodec/tests/utils.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 35e8ac9313..7706a03297 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -55,15 +55,16 @@ static void *codec_child_next(void *obj, void *prev) static const AVClass *codec_child_class_next(const AVClass *prev) { - AVCodec *c = NULL; + void *iter = NULL; + const AVCodec *c = NULL; /* find the codec that corresponds to prev */ - while (prev && (c = av_codec_next(c))) + while (prev && (c = av_codec_iterate(&iter))) if (c->priv_class == prev) break; /* find next codec with priv options */ - while (c = av_codec_next(c)) + while (c = av_codec_iterate(&iter)) if (c->priv_class) return c->priv_class; return NULL; diff --git a/libavcodec/tests/utils.c b/libavcodec/tests/utils.c index f6ba7fe66e..9232647ff0 100644 --- a/libavcodec/tests/utils.c +++ b/libavcodec/tests/utils.c @@ -19,10 +19,11 @@ #include "libavcodec/avcodec.h" int main(void){ - AVCodec *codec = NULL; + void *iter = NULL; + const AVCodec *codec = NULL; int ret = 0; - while (codec = av_codec_next(codec)) { + while (codec = av_codec_iterate(&iter)) { if (av_codec_is_encoder(codec)) { if (codec->type == AVMEDIA_TYPE_AUDIO) { if (!codec->sample_fmts) { |