Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 May 2015 10:16:07 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 May 2015 10:17:59 +0000 (12:17 +0200)
commit2ce2462ba8575ce16363064aecfc9fe2f4396bba
tree6a238fbfb1884febd180c53a9ab71e9ddda9706a
parent85bbe1dbd1cc2e72ea30958af9115b727e958b99
parentda5c6a97bbfe34d4b30a89e72150dd400299ddce
Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'

* commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce':
  riff: Add MultiScope II fourcc MSC2 as MJPEG

See: e31cdb5cc8080e164c66838a69f37f60f2d0ea82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/riff.c