[FFmpeg-cvslog] Merge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Tue Jan 31 17:11:24 2017 +0100| [5f633c39cd3ec13ea97e0a7474d452fd5cff8243] | committer: Clément Bœsch

Merge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'

* commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238':
  h264dec: make sure not to call finish_setup() more than once per frame

This commit is a noop, see bdbbb8f11edbf10add874508c5125c174d8939be

Merged-by: Clément Bœsch <cboesch at gopro.com>

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