RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e' 

* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
  arm: Add mathops.h to ARCH_HEADERS list
  avstring: K&R formatting cosmetics

Conflicts:
	libavutil/avstring.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-25 14:24:38 +01:00
parent e9125dd556 33552a5f7b
commit b2d0c5bd13
2 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/Makefile
View File

@ -1,3 +1,5 @@
ARCH_HEADERS = mathops.h
OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \
arm/ac3dsp_arm.o

25
libavutil/avstring.c
View File

@ -24,10 +24,11 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "avstring.h"
#include "config.h"
#include "common.h"
#include "mem.h"
#include "avstring.h"
int av_strstart(const char *str, const char *pfx, const char **ptr)
{
@ -56,10 +57,10 @@ char *av_stristr(const char *s1, const char *s2)
if (!*s2)
return (char*)(intptr_t)s1;
do {
do
if (av_stristart(s1, s2, NULL))
return (char*)(intptr_t)s1;
} while (*s1++);
while (*s1++);
return NULL;
}
@ -123,7 +124,8 @@ end:
char *av_d2str(double d)
{
char *str = av_malloc(16);
if(str) snprintf(str, 16, "%f", d);
if (str)
snprintf(str, 16, "%f", d);
return str;
}
@ -134,7 +136,8 @@ char *av_get_token(const char **buf, const char *term)
char *out = av_malloc(strlen(*buf) + 1);
char *ret = out, *end = out;
const char *p = *buf;
if (!out) return NULL;
if (!out)
return NULL;
p += strspn(p, WHITESPACES);
while (*p && !strspn(p, term)) {
@ -154,9 +157,9 @@ char *av_get_token(const char **buf, const char *term)
}
}
do{
do
*out-- = 0;
}while(out >= end && strspn(out, WHITESPACES));
while (out >= end && strspn(out, WHITESPACES));
*buf = p;
@ -251,17 +254,11 @@ const char *av_dirname(char *path)
return path;
}
#ifdef TEST
#include "common.h"
int main(void)
{
int i;
printf("Testing av_get_token()\n");
{
const char *strings[] = {
"''",
"",
@ -291,6 +288,7 @@ int main(void)
"\\'fo\\o\\:': foo ' :blahblah"
};
printf("Testing av_get_token()\n");
for (i = 0; i < FF_ARRAY_ELEMS(strings); i++) {
const char *p = strings[i];
char *q;
@ -300,7 +298,6 @@ int main(void)
printf(" + |%s|\n", p);
av_free(q);
}
}
return 0;
}