diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:41:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:41:36 +0200 |
| commit | fdccb84e3b94d3710c6aa253ccc68ad01c17cb45 (patch) | |
| tree | 3506062eed74514ea4649485b17f5d7ec318e78f | |
| parent | f083b4c33883719861c3055033dd35ffce73c6e0 (diff) | |
| parent | c0c2b96c136ec2cbfd808eefc26de399f447d62f (diff) | |
| download | ffmpeg-fdccb84e3b94d3710c6aa253ccc68ad01c17cb45.tar.gz | |
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>
| -rw-r--r-- | libavformat/avs.c | 4 | ||||
| -rw-r--r-- | libavformat/sctp.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c index 5908d838a1..7814301244 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -50,7 +50,9 @@ static int avs_probe(AVProbeData * p) d = p->buf; if (d[0] == 'w' && d[1] == 'W' && d[2] == 0x10 && d[3] == 0) - return AVPROBE_SCORE_EXTENSION+5; + /* Ensure the buffer probe scores higher than the extension probe. + * This avoids problems with misdetection as AviSynth scripts. */ + return AVPROBE_SCORE_EXTENSION + 5; return 0; } diff --git a/libavformat/sctp.c b/libavformat/sctp.c index 2fd5400ae5..f9ddb9f22d 100644 --- a/libavformat/sctp.c +++ b/libavformat/sctp.c @@ -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> |