[FFmpeg-cvslog] Merge commit '402fb5550e36dd994b13941ef5499f9087afd345'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 13:54:29 2015 +0100| [2bc841815c9c0ae37657e40f94d0dce2770f1e27] | committer: Michael Niedermayer

Merge commit '402fb5550e36dd994b13941ef5499f9087afd345'

* commit '402fb5550e36dd994b13941ef5499f9087afd345':
  opus_parser: drop unused variable

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

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