[FFmpeg-cvslog] Merge commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Nov 12 00:54:37 2017 -0300| [6bf041a2333a240619ba8661af6eccfaeb6c8b1f] | committer: James Almer

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 at gmail.com>

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