diff --git a/libavformat/avs.c b/libavformat/avs.c
index 5908d838a1c841e6d6fb018df929298fc4f8de4d..781430124444c0a715d524e691f5854b9f6d3f5b 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 2fd5400ae5d0b95e9de6d37ca1e824db96add907..f9ddb9f22df803a04b030dd1b3d1078ec24f0a6e 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>