Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'

* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
  avconv_opt: Consistently iterate through hwaccels array in all cases

Merged-by: James Almer <jamrial@gmail.com>

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");