[FFmpeg-cvslog] Merge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Oct 26 16:51:03 2017 -0300| [7066a92f87a418842b9c3ce9995e9c91370f4b62] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7066a92f87a418842b9c3ce9995e9c91370f4b62
---