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 /libavformat/avs.c | |
| 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>
Diffstat (limited to 'libavformat/avs.c')
| -rw-r--r-- | libavformat/avs.c | 4 |
1 files changed, 3 insertions, 1 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; } |