Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:41:38 +0000 (16:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:41:44 +0000 (16:41 +0200)
* commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7':
  riff.h: Remove stray extern declaration for non-existing symbol

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

Simple merge