Michael Niedermayer fdccb84e3b 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>

2013-05-05 12:41:36 +02:00

9.4 KiB

Raw Blame History

View Raw