[FFmpeg-cvslog] Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 12:15:50 2014 +0200| [83a897656aae95c0dc9f97a389cceb6986b79dd2] | committer: Michael Niedermayer

Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'

* commit 'fb238f8230c1b0314985482207add548c68f83cf':
  urlprotocol: remove unused url_interrupt_cb declaration

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

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