summaryrefslogtreecommitdiffstats
path: root/extra/mplayer/asmrules_fix_20061231.diff
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-08-11 21:30:24 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-08-11 21:30:24 +0200
commitee64be9f9bd9fd9a7ddbf9d75bb7642cd1b1ccca (patch)
treed0b757f572a0e5654030cbd4645c64826285ad30 /extra/mplayer/asmrules_fix_20061231.diff
parenta36d711d21e366e481d51e867a75b69b6820652a (diff)
downloadnutyx-extra-ee64be9f9bd9fd9a7ddbf9d75bb7642cd1b1ccca.tar.gz
nutyx-extra-ee64be9f9bd9fd9a7ddbf9d75bb7642cd1b1ccca.tar.bz2
nutyx-extra-ee64be9f9bd9fd9a7ddbf9d75bb7642cd1b1ccca.tar.xz
nutyx-extra-ee64be9f9bd9fd9a7ddbf9d75bb7642cd1b1ccca.zip
Ajout de mplayer#20090801-1
Diffstat (limited to 'extra/mplayer/asmrules_fix_20061231.diff')
-rw-r--r--extra/mplayer/asmrules_fix_20061231.diff45
1 files changed, 45 insertions, 0 deletions
diff --git a/extra/mplayer/asmrules_fix_20061231.diff b/extra/mplayer/asmrules_fix_20061231.diff
new file mode 100644
index 000000000..530a4eac2
--- /dev/null
+++ b/extra/mplayer/asmrules_fix_20061231.diff
@@ -0,0 +1,45 @@
+--- stream/realrtsp/asmrp.c (revision 20381)
++++ stream/realrtsp/asmrp.c (working copy)
+@@ -40,6 +40,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "asmrp.h"
+
+ /*
+ #define LOG
+@@ -645,8 +646,10 @@
+ #ifdef LOG
+ printf ("rule #%d is true\n", rule_num);
+ #endif
+- matches[num_matches] = rule_num;
+- num_matches++;
++ if(num_matches < MAX_RULEMATCHES - 1)
++ matches[num_matches++] = rule_num;
++ else
++ printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
+ }
+
+ rule_num++;
+--- stream/realrtsp/real.c (revision 20381)
++++ stream/realrtsp/real.c (working copy)
+@@ -271,7 +271,7 @@
+ int j=0;
+ int n;
+ char b[64];
+- int rulematches[16];
++ int rulematches[MAX_RULEMATCHES];
+
+ #ifdef LOG
+ printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
+--- stream/realrtsp/asmrp.h (revision 20381)
++++ stream/realrtsp/asmrp.h (working copy)
+@@ -40,6 +40,8 @@
+ #ifndef HAVE_ASMRP_H
+ #define HAVE_ASMRP_H
+
++#define MAX_RULEMATCHES 16
++
+ int asmrp_match (const char *rules, int bandwidth, int *matches) ;
+
+ #endif