Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 10:41:36 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 10:41:36 +0000 (12:41 +0200)
commitfdccb84e3b94d3710c6aa253ccc68ad01c17cb45
tree3506062eed74514ea4649485b17f5d7ec318e78f
parentf083b4c33883719861c3055033dd35ffce73c6e0
parentc0c2b96c136ec2cbfd808eefc26de399f447d62f
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@gmx.at>
libavformat/avs.c
libavformat/sctp.c