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)
commitf5b2718c0ae53459fbd506419884068687278583
tree3160e84f7966427d5b6e678d9dbb8f05c0a127a0
parent7d03e60c124be3e316636b0086910f1bcc1a797d
parent971cce7ebb48a58e72e4dc57b3008e2682bcf4e7
Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'

* commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7':
  riff.h: Remove stray extern declaration for non-existing symbol

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