diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-12 10:18:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-12 10:18:52 +0200 |
| commit | a4a706ff05afab9bb61870c0049aedb23072cec1 (patch) | |
| tree | c2200f0a6e7d6eb40e46a91443ef61b7774b5d9e /extra/mpd/ffmpeg.patch | |
| parent | 5d57336390ba107efd75b271608fde2fa6172193 (diff) | |
| parent | d976aa5e1544c80dc2457ea20b27f28f3fa05899 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/mcelog/PKGBUILD
extra/calligra/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/mpc/PKGBUILD
extra/opencv/PKGBUILD
extra/qt5/PKGBUILD
Diffstat (limited to 'extra/mpd/ffmpeg.patch')
| -rw-r--r-- | extra/mpd/ffmpeg.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/extra/mpd/ffmpeg.patch b/extra/mpd/ffmpeg.patch deleted file mode 100644 index 83b13d80f..000000000 --- a/extra/mpd/ffmpeg.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur old/src/decoder/ffmpeg_decoder_plugin.c new/src/decoder/ffmpeg_decoder_plugin.c ---- old/src/decoder/ffmpeg_decoder_plugin.c 2013-01-07 11:39:40.000000000 +1100 -+++ new/src/decoder/ffmpeg_decoder_plugin.c 2013-03-05 21:54:27.116585462 +1100 -@@ -395,6 +395,11 @@ - #endif - return SAMPLE_FORMAT_S32; - -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) -+ case AV_SAMPLE_FMT_FLTP: -+ return SAMPLE_FORMAT_FLOAT; -+#endif -+ - default: - break; - } |