diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-13 11:59:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-13 11:59:26 -0300 |
| commit | d94f762da472ecf1fae420622524c993db53a636 (patch) | |
| tree | 0a6da3280a39c3b9ded2cdc23fbfa57f61066caa /extra/ffmpeg | |
| parent | 69fbf2ca624da30dfaefb4c4150715df81d8cf00 (diff) | |
ffmpeg typo
Diffstat (limited to 'extra/ffmpeg')
| -rw-r--r-- | extra/ffmpeg/PKGBUILD | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 821fe2277..02c652099 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -10,7 +10,6 @@ pkgdesc="Complete and free Internet live audio and video broadcasting solution f arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" license=('GPL') -<<<<<<< HEAD if [ "${CARCH}" = "mips64el" ] ; then depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) makedepends=('git') |