[FFmpeg-cvslog] Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 12:41:36 2013 +0200| [fdccb84e3b94d3710c6aa253ccc68ad01c17cb45] | committer: Michael Niedermayer

Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
  sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
  avs: Increase magic value score above file extension score

Conflicts:
	libavformat/avs.c

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

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