virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases 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
commit fdccb84e3b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avs.c
View File

@ -50,6 +50,8 @@ static int avs_probe(AVProbeData * p)
d = p->buf; d = p->buf;
if (d[0] == 'w' && d[1] == 'W' && d[2] == 0x10 && d[3] == 0) if (d[0] == 'w' && d[1] == 'W' && d[2] == 0x10 && d[3] == 0)
/* Ensure the buffer probe scores higher than the extension probe.
* This avoids problems with misdetection as AviSynth scripts. */
return AVPROBE_SCORE_EXTENSION + 5; return AVPROBE_SCORE_EXTENSION + 5;
return 0; return 0;

8
libavformat/sctp.c
View File

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