diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-28 13:23:06 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-28 13:23:06 +0100 |
| commit | b1bde86b7410654132cd3365cc82e2ab7306b5f7 (patch) | |
| tree | cdd900b7b62d0bf35c9b980ab71e0474d604bd72 /extra/transcode | |
| parent | 6fee6e650c46dcf94e9bd79efa2b2bf8a298d271 (diff) | |
| parent | 24d0263a0ac516ccc86df09146449fb040fb3689 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gmic/PKGBUILD
community/projectm/PKGBUILD
extra/dvdauthor/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imagemagick/PKGBUILD
extra/obex-data-server/PKGBUILD
extra/phonon/PKGBUILD
extra/psiconv/PKGBUILD
extra/pstoedit/PKGBUILD
Diffstat (limited to 'extra/transcode')
| -rw-r--r-- | extra/transcode/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/transcode/ffmpeg-0.11.patch | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index d78814635..56f7909b1 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163161 2012-07-08 09:32:37Z ibiru $ +# $Id: PKGBUILD 169759 2012-10-27 23:42:25Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=5 +pkgrel=6 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" @@ -23,7 +23,7 @@ sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '765dacce5ee463adf5c124556d68bb873ef436c6') + '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch index 24beb1069..b5601fe2f 100644 --- a/extra/transcode/ffmpeg-0.11.patch +++ b/extra/transcode/ffmpeg-0.11.patch @@ -128,3 +128,14 @@ diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h avcodec_register_all(); \ TC_UNLOCK_LIBAVCODEC; \ } while (0) +--- transcode-1.1.7/export/export_ffmpeg.c.orig 2012-10-19 23:25:16.442303175 -0400 ++++ transcode-1.1.7/export/export_ffmpeg.c 2012-10-19 23:26:23.904268733 -0400 +@@ -1249,7 +1249,7 @@ + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (lavc_venc_context->codec->encode2 == NULL) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " + "(lavc_venc_context->codec->encode == NULL)"); + return TC_EXPORT_ERROR; |