Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:46:00 +0000 (16:46 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:46:00 +0000 (16:46 -0300)
commit10eb3259a65d664df8103e03b5d922b439cd7b07
treea023d25203e3f7e3b02a256b8d96ebebb8689652
parentb725b482c6af996cb1922c48c3b32c3a6e857ea1
parent01348e411f962f5e4605d649fc9a47a54587ba8e
Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'

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

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