diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-07-10 19:35:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-14 23:44:32 +0200 |
commit | 2563210d055ef261d6443472daeacf21f16253a2 (patch) | |
tree | b3c5827b512f203196fed5a5c3c4d1bbc4768ca9 /meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch | |
parent | 54ca918b6cc562a9719dbb2a4ad40e862155a238 (diff) | |
download | meta-openembedded-2563210d055ef261d6443472daeacf21f16253a2.tar.gz |
faac: update 1.28 -> 1.29
Most patches don't apply any more and build succeeds
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch')
-rw-r--r-- | meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch b/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch deleted file mode 100644 index 92fdd9bab..000000000 --- a/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | --- faac-1.28/common/mp4v2/atom_standard.cpp.orig 2016-06-16 07:59:21.657040761 -0400 | ||
2 | +++ faac-1.28/common/mp4v2/atom_standard.cpp 2016-06-16 08:01:50.613036724 -0400 | ||
3 | @@ -22,15 +22,15 @@ | ||
4 | #include "mp4common.h" | ||
5 | #include "atoms.h" | ||
6 | |||
7 | -static const char name[5]={0251,'n', 'a', 'm', '\0'}; | ||
8 | -static const char art[5]={0251,'A', 'R', 'T', '\0'}; | ||
9 | -static const char wrt[5]={0251,'w', 'r', 't', '\0'}; | ||
10 | -static const char alb[5]={0251,'a', 'l', 'b', '\0'}; | ||
11 | -static const char day[5]={0251,'d', 'a', 'y', '\0'}; | ||
12 | -static const char too[5]={0251,'t', 'o', 'o', '\0'}; | ||
13 | -static const char cmt[5]={0251,'c', 'm', 't', '\0'}; | ||
14 | -static const char gen[5]={0251,'g', 'e', 'n', '\0'}; | ||
15 | -static const char grp[5]={0251,'g', 'r', 'p', '\0'}; | ||
16 | +static const char name[5]={(char)0251,'n', 'a', 'm', '\0'}; | ||
17 | +static const char art[5]={(char)0251,'A', 'R', 'T', '\0'}; | ||
18 | +static const char wrt[5]={(char)0251,'w', 'r', 't', '\0'}; | ||
19 | +static const char alb[5]={(char)0251,'a', 'l', 'b', '\0'}; | ||
20 | +static const char day[5]={(char)0251,'d', 'a', 'y', '\0'}; | ||
21 | +static const char too[5]={(char)0251,'t', 'o', 'o', '\0'}; | ||
22 | +static const char cmt[5]={(char)0251,'c', 'm', 't', '\0'}; | ||
23 | +static const char gen[5]={(char)0251,'g', 'e', 'n', '\0'}; | ||
24 | +static const char grp[5]={(char)0251,'g', 'r', 'p', '\0'}; | ||
25 | |||
26 | MP4StandardAtom::MP4StandardAtom (const char *type) : MP4Atom(type) | ||
27 | { | ||
28 | --- faac-1.28/common/mp4v2/mp4atom.cpp.orig 2016-06-16 08:03:07.777034633 -0400 | ||
29 | +++ faac-1.28/common/mp4v2/mp4atom.cpp 2016-06-16 08:03:54.629033363 -0400 | ||
30 | @@ -264,11 +264,11 @@ | ||
31 | } | ||
32 | break; | ||
33 | case 0251: | ||
34 | - static const char name[5]={0251,'n', 'a', 'm', '\0'}; | ||
35 | - static const char cmt[5]={0251,'c', 'm', 't', '\0'}; | ||
36 | - static const char cpy[5]={0251,'c', 'p', 'y', '\0'}; | ||
37 | - static const char des[5]={0251,'d', 'e', 's','\0'}; | ||
38 | - static const char prd[5]={0251, 'p', 'r', 'd', '\0'}; | ||
39 | + static const char name[5]={(char)0251,'n', 'a', 'm', '\0'}; | ||
40 | + static const char cmt[5]={(char)0251,'c', 'm', 't', '\0'}; | ||
41 | + static const char cpy[5]={(char)0251,'c', 'p', 'y', '\0'}; | ||
42 | + static const char des[5]={(char)0251,'d', 'e', 's','\0'}; | ||
43 | + static const char prd[5]={(char)0251, 'p', 'r', 'd', '\0'}; | ||
44 | if (ATOMID(type) == ATOMID(name) || | ||
45 | ATOMID(type) == ATOMID(cmt) || | ||
46 | ATOMID(type) == ATOMID(cpy) || | ||
47 | |||