Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 18:56:41 +0000 (20:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 19:09:03 +0000 (21:09 +0200)
commit9c56cf09ca6da8b89c3155dc50f75232571d0be7
treeb897989c7828519f0f30613ad71c88dbda070830
parent036162a3787044cd82b6fa4e73eb56ddf2e57c96
parent3c04ec04df8cba12f3a7408709ff5c1fddfe8d82
Merge commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82'

* commit '3c04ec04df8cba12f3a7408709ff5c1fddfe8d82':
  riff: Add GLV4 fourcc for mpeg4

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