[FFmpeg-cvslog] Merge commit '8629149816930a43bf5a66b11c6224446cabd044'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Mar 10 22:17:25 2019 -0300| [44085b9951b06df1cab4105dcda004213988d84f] | committer: James Almer

Merge commit '8629149816930a43bf5a66b11c6224446cabd044'

* commit '8629149816930a43bf5a66b11c6224446cabd044':
  tests: Drop duplicate variable declaration

This commit is a noop, as it breaks tests like fate-filter-pixfmts

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

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