ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

libmpeg2: update to 0.5.1

Browse Source 
The patch seems unnecessary but I'll look out for breakage.
This commit is contained in:
Mateusz Kowalczyk 2014-08-29 14:33:25 +01:00
parent acdb739b8d
commit 0fb885721a
2 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/libraries/libmpeg2/A00-tags.patch
View File

@ -1,27 +0,0 @@
diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c
--- mpeg2dec.orig/libmpeg2/decode.c 2008-07-09 12:16:05.000000000 -0700
+++ mpeg2dec/libmpeg2/decode.c 2009-07-03 16:29:48.000000000 -0700
@@ -212,7 +212,7 @@
mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec)
{
- static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = {
+ static int (* process_header[]) (mpeg2dec_t *) = {
mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data,
mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop
};
@@ -368,6 +368,14 @@
void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2)
{
+ if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) {
+ // since tags got processed when we entered this state we
+ // have to set them directly or they'll end up on the next frame.
+ mpeg2dec->picture->tag = tag;
+ mpeg2dec->picture->tag2 = tag2;
+ mpeg2dec->picture->flags |= PIC_FLAG_TAGS;
+ return;
+ }
mpeg2dec->tag_previous = mpeg2dec->tag_current;
mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
mpeg2dec->tag_current = tag;

12
pkgs/development/libraries/libmpeg2/default.nix
View File

@ -1,20 +1,18 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmpeg2-0.5.1p4"; version = "0.5.1";
name = "libmpeg2-${version}";
src = fetchurl { src = fetchurl {
url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz"; url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
}; };
# From Handbrake - Project seems unmaintained
patches = [
./A00-tags.patch
];
meta = { meta = {
homepage = http://libmpeg2.sourceforge.net/; homepage = http://libmpeg2.sourceforge.net/;
description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
license = stdenv.lib.licenses.gpl2;
maintainer = with stdenv.lib.maintainers; [ fuuzetsu ];
}; };
} }