Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'e002e3291e'

Browse source 
* commit 'e002e3291e':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
	doc/APIchanges
	libavcodec/svq3.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-12 14:52:34 +02:00
commit f391e405df
18 changed files with 99 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libavutil/parseutils.c
View file

@ -690,7 +690,7 @@ int main(void)
printf("Testing av_parse_video_rate()\n");
{
int i;
const char *rates[] = {
static const char *const rates[] = {
"-inf",
"inf",
"nan",
@ -720,7 +720,7 @@ int main(void)
for (i = 0; i < FF_ARRAY_ELEMS(rates); i++) {
int ret;
AVRational q = (AVRational){0, 0};
AVRational q = { 0, 0 };
ret = av_parse_video_rate(&q, rates[i]);
printf("'%s' -> %d/%d %s\n",
rates[i], q.num, q.den, ret ? "ERROR" : "OK");
@ -731,7 +731,7 @@ int main(void)
{
int i;
uint8_t rgba[4];
const char *color_names[] = {
static const char *const color_names[] = {
"bikeshed",
"RaNdOm",
"foo",
@ -774,7 +774,8 @@ int main(void)
for (i = 0; i < FF_ARRAY_ELEMS(color_names); i++) {
if (av_parse_color(rgba, color_names[i], -1, NULL) >= 0)
printf("%s -> R(%d) G(%d) B(%d) A(%d)\n", color_names[i], rgba[0], rgba[1], rgba[2], rgba[3]);
printf("%s -> R(%d) G(%d) B(%d) A(%d)\n",
color_names[i], rgba[0], rgba[1], rgba[2], rgba[3]);
else
printf("%s -> error\n", color_names[i]);
}