Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 12:03:50 +0000 (14:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 12:03:54 +0000 (14:03 +0200)
commit23c8a3353bd948f4a69116124dc433c85909d86e
tree4d992f5ed5291216815f8289fd4d7c093eb3c73b
parentaeddc6e3a552d094dfb890dd1f017421816e367b
parenta52b5a5a07b0d432f9bed90b6d56647f8d44fbce
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: Add a mapping for VP6A

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