1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
$NetBSD: patch-ac,v 1.1.1.1 2005/03/01 01:17:01 xtraeme Exp $
--- ffmpeg-strip-wma/asf.c.orig Wed May 26 19:16:39 2004
+++ ffmpeg-strip-wma/asf.c Sat Dec 11 21:32:58 2004
@@ -16,10 +16,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
+#ifdef USE_ICONV
+#include <iconv.h>
+#endif
+
#include "avformat.h"
#include "avi.h"
-//#include "mpegaudio.h"
-#include <iconv.h>
#undef NDEBUG
#include <assert.h>
@@ -830,6 +833,7 @@
return str;
}
+#ifdef USE_ICONV
static void tag_recode(char *before, int len)
{
int result;
@@ -859,6 +863,7 @@
return;
return;
}
+#endif
static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
{
@@ -868,12 +873,17 @@
q = buf;
lenz = len;
while (len > 0) {
- c = get_byte(pb);
- if ((q - buf) < buf_size-1)
- *q++ = c;
- len--;
+ c = get_byte(pb);
+ if ((q - buf) < buf_size - 1)
+ *q++ = c;
+ len--;
}
- tag_recode(buf, lenz);
+
+#ifdef USE_ICONV
+ tag_recode(buf, lenz);
+#else
+ *q = '\0';
+#endif
}
static int asf_probe(AVProbeData *pd)
|
