]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa2d285 2beba58)
Merge commit '2beba58e0e4bda688bf96e12413231607ceafdd4'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Dec 2017 00:05:11 +0000 (21:05 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Dec 2017 00:05:11 +0000 (21:05 -0300)
* commit '2beba58e0e4bda688bf96e12413231607ceafdd4':
  mmaldec: Fix compilation after 2fcb0090

This commit is a noop, see 758fbc54fef2f31957b5c5f22e05e5fd9b04f631

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

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