Commit 22381906 authored by Josh de Kock's avatar Josh de Kock

cmdutils: use new APIs

Signed-off-by: 's avatarJosh de Kock <josh@itanimul.li>
parent 65452bcd
...@@ -1259,8 +1259,10 @@ static int is_device(const AVClass *avclass) ...@@ -1259,8 +1259,10 @@ static int is_device(const AVClass *avclass)
static int show_formats_devices(void *optctx, const char *opt, const char *arg, int device_only, int muxdemuxers) static int show_formats_devices(void *optctx, const char *opt, const char *arg, int device_only, int muxdemuxers)
{ {
AVInputFormat *ifmt = NULL; void *ifmt_opaque = NULL;
AVOutputFormat *ofmt = NULL; const AVInputFormat *ifmt = NULL;
void *ofmt_opaque = NULL;
const AVOutputFormat *ofmt = NULL;
const char *last_name; const char *last_name;
int is_dev; int is_dev;
...@@ -1276,7 +1278,8 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg, ...@@ -1276,7 +1278,8 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
const char *long_name = NULL; const char *long_name = NULL;
if (muxdemuxers !=SHOW_DEMUXERS) { if (muxdemuxers !=SHOW_DEMUXERS) {
while ((ofmt = av_oformat_next(ofmt))) { ifmt_opaque = NULL;
while ((ofmt = av_muxer_iterate(&ofmt_opaque))) {
is_dev = is_device(ofmt->priv_class); is_dev = is_device(ofmt->priv_class);
if (!is_dev && device_only) if (!is_dev && device_only)
continue; continue;
...@@ -1289,7 +1292,8 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg, ...@@ -1289,7 +1292,8 @@ static int show_formats_devices(void *optctx, const char *opt, const char *arg,
} }
} }
if (muxdemuxers != SHOW_MUXERS) { if (muxdemuxers != SHOW_MUXERS) {
while ((ifmt = av_iformat_next(ifmt))) { ofmt_opaque = NULL;
while ((ifmt = av_demuxer_iterate(&ifmt_opaque))) {
is_dev = is_device(ifmt->priv_class); is_dev = is_device(ifmt->priv_class);
if (!is_dev && device_only) if (!is_dev && device_only)
continue; continue;
...@@ -1629,6 +1633,7 @@ int show_filters(void *optctx, const char *opt, const char *arg) ...@@ -1629,6 +1633,7 @@ int show_filters(void *optctx, const char *opt, const char *arg)
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
const AVFilter *filter = NULL; const AVFilter *filter = NULL;
char descr[64], *descr_cur; char descr[64], *descr_cur;
void *opaque = NULL;
int i, j; int i, j;
const AVFilterPad *pad; const AVFilterPad *pad;
...@@ -1640,7 +1645,7 @@ int show_filters(void *optctx, const char *opt, const char *arg) ...@@ -1640,7 +1645,7 @@ int show_filters(void *optctx, const char *opt, const char *arg)
" V = Video input/output\n" " V = Video input/output\n"
" N = Dynamic number and/or type of input/output\n" " N = Dynamic number and/or type of input/output\n"
" | = Source or sink filter\n"); " | = Source or sink filter\n");
while ((filter = avfilter_next(filter))) { while ((filter = av_filter_iterate(&opaque))) {
descr_cur = descr; descr_cur = descr;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (i) { if (i) {
......
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