Line 0
Link Here
|
|
|
1 |
--- ffmpeg-strip-wma/asf.c.orig Sun Jul 11 06:51:15 2004 |
2 |
+++ ffmpeg-strip-wma/asf.c Sun Jul 11 06:53:34 2004 |
3 |
@@ -18,8 +18,6 @@ |
4 |
*/ |
5 |
#include "avformat.h" |
6 |
#include "avi.h" |
7 |
-//#include "mpegaudio.h" |
8 |
-#include <iconv.h> |
9 |
|
10 |
#undef NDEBUG |
11 |
#include <assert.h> |
12 |
@@ -830,6 +828,7 @@ |
13 |
return str; |
14 |
} |
15 |
|
16 |
+/* |
17 |
static void tag_recode(char *before, int len) |
18 |
{ |
19 |
int result; |
20 |
@@ -859,21 +858,22 @@ |
21 |
return; |
22 |
return; |
23 |
} |
24 |
+*/ |
25 |
|
26 |
static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size) |
27 |
{ |
28 |
- int c, lenz; |
29 |
+ int c; |
30 |
char *q; |
31 |
|
32 |
q = buf; |
33 |
- lenz = len; |
34 |
while (len > 0) { |
35 |
- c = get_byte(pb); |
36 |
- if ((q - buf) < buf_size-1) |
37 |
- *q++ = c; |
38 |
- len--; |
39 |
- } |
40 |
- tag_recode(buf, lenz); |
41 |
+ c = get_le16(pb); |
42 |
+ if ((q - buf) < buf_size - 1) |
43 |
+ *q++ = c; |
44 |
+ len-=2; |
45 |
+ } |
46 |
+ |
47 |
+ *q = '\0'; |
48 |
} |
49 |
|
50 |
static int asf_probe(AVProbeData *pd) |