Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'
authorJames Almer <jamrial@gmail.com>
Sat, 6 Aug 2016 16:31:12 +0000 (13:31 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 6 Aug 2016 16:31:12 +0000 (13:31 -0300)
commit61da882cea4579658e8d01e24b8cb71c98df2b94
tree3678708944f57b1e988f7ca640dbfae77744f42e
parent2ce985c049bccec6ca625ab9944f54f132499d54
parent90944ee3ab79081845ea1bd97eea475031ce0842
Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'

* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
  avconv: refactor selecting an encoder

Conflicts:
ffmpeg.c
ffmpeg_opt.c

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