diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-31 16:46:00 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-31 16:46:00 -0300 |
| commit | 10eb3259a65d664df8103e03b5d922b439cd7b07 (patch) | |
| tree | a023d25203e3f7e3b02a256b8d96ebebb8689652 /ffmpeg_opt.c | |
| parent | b725b482c6af996cb1922c48c3b32c3a6e857ea1 (diff) | |
| parent | 01348e411f962f5e4605d649fc9a47a54587ba8e (diff) | |
| download | ffmpeg-10eb3259a65d664df8103e03b5d922b439cd7b07.tar.gz | |
Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'
* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
avconv_opt: Consistently iterate through hwaccels array in all cases
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index ffe1abdb38..d1fe8742ff 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -185,7 +185,7 @@ static int show_hwaccels(void *optctx, const char *opt, const char *arg) int i; printf("Hardware acceleration methods:\n"); - for (i = 0; i < FF_ARRAY_ELEMS(hwaccels) - 1; i++) { + for (i = 0; hwaccels[i].name; i++) { printf("%s\n", hwaccels[i].name); } printf("\n"); |