Merge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'
authorJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:51:03 +0000 (16:51 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:51:03 +0000 (16:51 -0300)
commit7066a92f87a418842b9c3ce9995e9c91370f4b62
tree12f015578043954e3f85f4d0588dad886ef20ef1
parent99ba85a0e24bad519a633a1a113d838897bee0b1
parentefddf2c09aed7400c73ecf327f86a4d0452b94b5
Merge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'

* commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5':
  decode: Initialize ret before using it
  filtfmts-test: Mark filter as const

This commit is a noop, see
3c14547eb75c5b18099060085d12f09518ee2732
960b4d47612ec89cfdf0ff8b83bc7424ad4c754a

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