Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 18:33:06 +0000 (20:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 18:33:51 +0000 (20:33 +0200)
* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
  riff: Add 'M705' FourCC for mpeg2video

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

Simple merge