diff options
| author | Bobby Bingham <uhmmmm@gmail.com> | 2012-09-18 23:27:43 -0500 |
|---|---|---|
| committer | Bobby Bingham <uhmmmm@gmail.com> | 2012-09-18 23:27:43 -0500 |
| commit | d0c6ac0debaff1ca32be71cbbf958698106c3c4f (patch) | |
| tree | 1d00dccbbee6d1d5515da847254fb77ad027573b /cmdutils.c | |
| parent | f1b6c14297198c995d862cc9a9ba59d7968f14c9 (diff) | |
| download | ffmpeg-d0c6ac0debaff1ca32be71cbbf958698106c3c4f.tar.gz | |
Fix segfault with -filters option
Filters now use null pointers to indicate having no input/output pads,
rather than empty lists of pads. We can't assume pad is non-null
anymore.
Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 3ed143e5f4..bd4ba4ad2d 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1041,7 +1041,7 @@ int show_filters(void *optctx, const char *opt, const char *arg) *(descr_cur++) = '>'; } pad = i ? (*filter)->outputs : (*filter)->inputs; - for (j = 0; pad[j].name; j++) { + for (j = 0; pad && pad[j].name; j++) { if (descr_cur >= descr + sizeof(descr) - 4) break; *(descr_cur++) = get_media_type_char(pad[j].type); |