[FFmpeg-cvslog] Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 16:41:38 2013 +0200| [f5b2718c0ae53459fbd506419884068687278583] | committer: Michael Niedermayer

Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5b2718c0ae53459fbd506419884068687278583
---