]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc0ca50 1f7b4f9)
Merge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'
authorClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:11:24 +0000 (17:11 +0100)
committerClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:11:24 +0000 (17:11 +0100)
* 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@gopro.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.