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)
* qatar/master:
  riff: Add a mapping for VP6A

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

Simple merge