diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2005-03-18 08:10:35 +0000 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2005-03-18 08:10:35 +0000 |
commit | 421d6ac92a9739c8ead51b4ce1557e47ff55d396 (patch) | |
tree | d22d35db8a496ae58bafa72cf1178064b25f5d95 /pkgs/tools/video | |
parent | 10e4887e50c7f25ca6539173d21415b9b3fa30f0 (diff) |
* mjpegtools 1.6.2
svn path=/nixpkgs/trunk/; revision=2429
Diffstat (limited to 'pkgs/tools/video')
-rw-r--r-- | pkgs/tools/video/mjpegtools/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/video/mjpegtools/fix.patch | 36 |
2 files changed, 47 insertions, 0 deletions
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix new file mode 100644 index 0000000000000..2cbadfcfe86c1 --- /dev/null +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -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]; +} diff --git a/pkgs/tools/video/mjpegtools/fix.patch b/pkgs/tools/video/mjpegtools/fix.patch new file mode 100644 index 0000000000000..2103fda54b4a4 --- /dev/null +++ b/pkgs/tools/video/mjpegtools/fix.patch @@ -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++) + { + |