OSDN Git Service

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)
commite77270cd93e1e77e99fb6d210e3bea0db9909ac4
treed2749a537b6a2f91b4ca65325534cac6da19c425
parent72a580268ff92b1909102b26c1c5fce9086f20e4
parent783df7d5c5ab15f3d1afe2541c7d461c81c5c29d
Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'

* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
  riff: Add 'M705' FourCC for mpeg2video

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