generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-05-05 12:41:36 +02:00
parent f083b4c338 c0c2b96c13
commit fdccb84e3b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/sctp.c
View File

@@ -56,10 +56,10 @@
/*
* The sctp_recvmsg and sctp_sendmsg functions are part of the user
* library that offers support
* for the SCTP kernel Implementation. The main purpose of this
* code is to provide the SCTP Socket API mappings for user
* application to interface with the SCTP in kernel.
* library that offers support for the SCTP kernel Implementation.
* To avoid build-time clashes the functions sport an ff_-prefix here.
* The main purpose of this code is to provide the SCTP Socket API
* mappings for user applications to interface with SCTP in the kernel.
*
* This implementation is based on the Socket API Extensions for SCTP
* defined in <draft-ietf-tsvwg-sctpsocket-10.txt>