diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-30 12:20:50 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-30 12:20:50 -0300 |
| commit | f945a6a14843dcca046e22f28d0cb0ca75fe27de (patch) | |
| tree | 128fd26fe2a604e6f5d3d6105da06610332d524a /community/avifile/gcc.patch | |
| parent | 14995c4581e56e6540a9c89074623e73b9f1fc49 (diff) | |
| parent | dba5b0127d9f00a13c489f0f5893481cbe7d429b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avifile/PKGBUILD
community/drbd/PKGBUILD
extra/feh/PKGBUILD
extra/samba/PKGBUILD
libre/syslinux/PKGBUILD
social/batctl/PKGBUILD
Diffstat (limited to 'community/avifile/gcc.patch')
| -rw-r--r-- | community/avifile/gcc.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/community/avifile/gcc.patch b/community/avifile/gcc.patch index e93de24a8..078b4ae81 100644 --- a/community/avifile/gcc.patch +++ b/community/avifile/gcc.patch @@ -131,3 +131,15 @@ diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp avifile-0.7-0.7.45.my if (!base) avml(AVML_WARN, "v4l1: can not allocate frame buffer base: %p\n", base); +diff -wbBur avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.45.my/lib/aviread/AsfNetworkInputStream.cpp +--- avifile-0.7-0.7.45.org/lib/aviread/AsfNetworkInputStream.cpp 2004-10-25 14:15:38.000000000 +0400 ++++ avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp 2012-08-28 13:26:33.000000000 +0400 +@@ -937,7 +937,7 @@ + } + + asf_packet* p; +- unsigned short& size = chhdr.size; ++ uint16_t size = chhdr.size; + //printf("STREAMPACKET 0x%x sz:%d %lld seq:%d part:%d sc:%d\n", chhdr.kind, size, rsize, chhdr.seq, chhdr.partflag, chhdr.size_confirm); + switch (chhdr.kind) + { |