diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-27 14:27:56 +0100 |
| commit | 6cc3a23ea1231ea627394677df2bebdc403acb38 (patch) | |
| tree | 14c20984a10df92c0b5cbb3b4477f0358cf8b01f /community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch | |
| parent | 8e40bdbb2496be15fdba2e683af427bc2333be42 (diff) | |
| parent | 3741146d50cb93e8985f8aac937e36d35ee76446 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/torcs/PKGBUILD
community/fceux/PKGBUILD
core/gcc/PKGBUILD
core/wireless_tools/PKGBUILD
extra/gtk-xfce-engine/PKGBUILD
extra/gtk2/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-sdl/PKGBUILD
testing/kdebase-runtime/PKGBUILD
testing/kdelibs/PKGBUILD
testing/libarchive/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/udev/PKGBUILD
Diffstat (limited to 'community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch')
| -rw-r--r-- | community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch new file mode 100644 index 000000000..af8c282c0 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch @@ -0,0 +1,25 @@ +From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Thu, 7 Jul 2011 22:31:44 +0400 +Subject: [PATCH 2/2] ffmpeg: version check fix + +--- + plugins/ffmpeg/ffmpeg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 0cb9955..37c7e80 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -718,7 +718,7 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0) + av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); + #else + av_register_protocol (&vfswrapper); +-- +1.7.8.4 + |