]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 792802f fbca6e7)
Merge commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:54:37 +0000 (00:54 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:54:37 +0000 (00:54 -0300)
* commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a':
  matroskadec: allow RealAudio/Cook/Sipro streams of flavor 0

This commit is a noop, see 0d944ee34349805b29f9c91b15c8009d16df01ab

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

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