diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-29 10:39:31 +0100 |
| commit | 4a534f68f38c221a2276fa791e086c3848ce515d (patch) | |
| tree | 7963845c02cde2b1f4a4fb8a6c6cfa497b5ee5d5 /extra/transcode/ffmpeg-0.10.patch | |
| parent | d5acc51bdb801d2bb930af53220946e739dd5edd (diff) | |
| parent | 738e6c6d93b4c7118e49b38c610abed8b7f7d55a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/calibre/PKGBUILD
community/ffmpeg2theora/PKGBUILD
core/e2fsprogs/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/ffmpeg/PKGBUILD
multilib/lib32-alsa-lib/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-alsa-plugins/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
staging/transcode/PKGBUILD
staging/vlc/PKGBUILD
Diffstat (limited to 'extra/transcode/ffmpeg-0.10.patch')
| -rw-r--r-- | extra/transcode/ffmpeg-0.10.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch new file mode 100644 index 000000000..5965c180c --- /dev/null +++ b/extra/transcode/ffmpeg-0.10.patch @@ -0,0 +1,14 @@ +diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c +--- transcode-1.1.7.orig/filter/filter_pp.c 2012-01-27 19:55:13.706613234 +0000 ++++ transcode-1.1.7/filter/filter_pp.c 2012-01-27 19:56:04.719541629 +0000 +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + |