From d8ae40611bc01257776b71f20d774eb720151906 Mon Sep 17 00:00:00 2001 From: Josh de Kock Date: Fri, 23 Mar 2018 10:16:15 +0000 Subject: Revert "lavd: add new API for iterating input and output devices" This reverts commit 0fd475704e871ef3a535947596a012894bae3cbd. Revert "lavd: fix iterating of input and output devices" This reverts commit ce1d77a5e7cebce11074bf6f9e38ad6da37338ff. Signed-off-by: Josh de Kock --- libavformat/format.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libavformat/format.c') diff --git a/libavformat/format.c b/libavformat/format.c index 75951938cf..123f5faf6c 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -129,18 +129,10 @@ enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, AVInputFormat *av_find_input_format(const char *short_name) { AVInputFormat *fmt = NULL; -#if FF_API_NEXT -FF_DISABLE_DEPRECATION_WARNINGS - while ((fmt = av_iformat_next(fmt))) - if (av_match_name(short_name, fmt->name)) - return fmt; -FF_ENABLE_DEPRECATION_WARNINGS -#else void *i = 0; while ((fmt = av_demuxer_iterate(&i))) if (av_match_name(short_name, fmt->name)) return fmt; -#endif return NULL; } -- cgit v1.2.3