alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* mjpegtools 1.6.2

Browse source 
svn path=/nixpkgs/trunk/; revision=2429
This commit is contained in:
Rob Vermaas 2005-03-18 08:10:35 +00:00
parent 10e4887e50
commit 421d6ac92a
3 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/system/all-packages-generic.nix
View file

@ -183,7 +183,8 @@ rec {
};
mjpegtools = (import ../tools/video/mjpegtools) {
inherit fetchurl stdenv;
inherit fetchurl stdenv libjpeg;
inherit (xlibs) libX11;
};
### SHELLS

11
pkgs/tools/video/mjpegtools/default.nix Normal file
View file

@ -0,0 +1,11 @@
{stdenv, fetchurl, libjpeg, libX11}:
stdenv.mkDerivation {
name = "mjpegtools-1.6.2";
src = fetchurl {
url = http://mesh.dl.sourceforge.net/sourceforge/mjpeg/mjpegtools-1.6.2.tar.gz ;
md5 = "01c0120b0182de67f182ef99ad855daa" ;
};
buildInputs = [libjpeg libX11];
patches = [./fix.patch];
}

36
pkgs/tools/video/mjpegtools/fix.patch Normal file
View file

@ -0,0 +1,36 @@
*** /tmp/mjpegtools-1.6.2/lavtools/lavpipe.c Mon Sep 23 19:46:43 2002
--- mjpegtools-1.6.2/lavtools/lavpipe.c Thu Mar 17 10:24:10 2005
***************
*** 582,587 ****
--- 582,588 ----
mjpeg_info( "closing input %d (source %d)", i, current_index);
decommission_pipe_source(source);
KEEP_SOURCE:
+ ;
}
}
}
*** /tmp/mjpegtools-1.6.2/mpeg2enc/picture.cc Sat Oct 25 17:36:32 2003
--- mjpegtools-1.6.2/mpeg2enc/picture.cc Fri Mar 18 07:55:36 2005
***************
*** 83,91 ****
}
! curref = new (uint8_t *)[5];
! curorg = new (uint8_t *)[5];
! pred = new (uint8_t *)[5];
for( i = 0 ; i<3; i++)
{
--- 83,91 ----
}
! curref = new uint8_t *[5];
! curorg = new uint8_t *[5];
! pred = new uint8_t *[5];
for( i = 0 ; i<3; i++)
{