summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-12 00:54:37 -0300
committerJames Almer <jamrial@gmail.com>2017-11-12 00:54:37 -0300
commit6bf041a2333a240619ba8661af6eccfaeb6c8b1f (patch)
treeee0d96d3ed11ffd04e0e16ad97af23c56917fd59 /Makefile
parent792802f5f91a6119732d04ee0f440d763755be50 (diff)
parentfbca6e7d162b9a7105d1059826dfe96616fa803a (diff)
downloadffmpeg-streaming-6bf041a2333a240619ba8661af6eccfaeb6c8b1f.zip
ffmpeg-streaming-6bf041a2333a240619ba8661af6eccfaeb6c8b1f.tar.gz
Merge commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a'
* 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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud