Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4030
Modified Files:
ffmpeg.info libavcodec53-shlibs.info
Added Files:
ffmpeg.patch
Log Message:
ffmpeg 0.7.14 and 0.8.13
Index: ffmpeg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/ffmpeg.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ffmpeg.info 4 Feb 2013 02:09:24 -0000 1.15
+++ ffmpeg.info 20 Feb 2013 01:19:40 -0000 1.16
@@ -1,6 +1,6 @@
Package: ffmpeg
-Version: 0.7.13
-Revision: 4
+Version: 0.7.14
+Revision: 1
###
BuildDepends: <<
bzip2,
@@ -61,14 +61,14 @@
#BuildConflicts: libavcodec1-dev, libpostproc1, libavformat1-dev
###
Source: http://ffmpeg.org/releases/%n-%v.tar.bz2
-Source-MD5: b226a3d4f81d45e4a81632f6e94b098c
+Source-MD5: c283472a18ae16bc8e49e1869f9a4ad6
###
-# link directly to build-dir lib files instead of mis-ordering local -L flags
-# make sure global -I come after local ones too
-#PatchFile: %n.patch
-#PatchFile-MD5: 4f7322c02bb0e6dc319974313bd3612d
+###libavcodec/vqavideo.c returned a type when it shouldn't
+PatchFile: %n.patch
+PatchFile-MD5: 8f531359de77bd40c214ba5525817441
PatchScript: <<
#!/bin/sh -ev
+ %{default_script}
### Give dylibs a versioned install_name
perl -pi -e
's;-install_name,\$\(SHLIBDIR\)/\$\(SLIBNAME\);-install_name,\$\(SHLIBDIR\)/\$\(SLIBNAME_WITH_MAJOR\);g'
configure
### enforce use of system texi2html which is newer than Fink's so it doesn't
fail on --init-file
Index: libavcodec53-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libavcodec53-shlibs.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- libavcodec53-shlibs.info 28 Sep 2012 14:20:54 -0000 1.16
+++ libavcodec53-shlibs.info 20 Feb 2013 01:19:40 -0000 1.17
@@ -1,6 +1,6 @@
Package: libavcodec53-shlibs
-Version: 0.8.12
-Revision: 3
+Version: 0.8.13
+Revision: 1
###
BuildDepends: <<
bzip2,
@@ -54,8 +54,11 @@
<<
###
Source: http://ffmpeg.org/releases/ffmpeg-%v.tar.bz2
-Source-MD5: c2e5a219e0c845fe11f9dae9c169640f
+Source-MD5: 91274beaa30b42f8a7e9dbe8e21ef9a0
###
+###libavcodec/vqavideo.c returned a type when it shouldn't
+PatchFile: ffmpeg.patch
+PatchFile-MD5: 8f531359de77bd40c214ba5525817441
PatchScript: <<
#!/bin/sh -ev
%{default_script}
--- NEW FILE: ffmpeg.patch ---
>From 1fd86f9a2136165205b0370d5a6e916499f1da7f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michae...@gmx.at>
Date: Wed, 20 Feb 2013 00:47:13 +0100
Subject: [PATCH] vqavideo: fix return type
Fixes Ticket2281
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
---
libavcodec/vqavideo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 6e1ce6c..e7b2cae 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -529,7 +529,7 @@ static void vqa_decode_chunk(VqaContext *s)
if (chunk_size > MAX_CODEBOOK_SIZE - s->next_codebook_buffer_index) {
av_log(s->avctx, AV_LOG_ERROR, "cbp0 chunk too large (0x%X
bytes)\n", chunk_size);
- return AVERROR_INVALIDDATA;
+ return;
}
/* accumulate partial codebook */
@@ -557,7 +557,7 @@ static void vqa_decode_chunk(VqaContext *s)
if (chunk_size > MAX_CODEBOOK_SIZE - s->next_codebook_buffer_index) {
av_log(s->avctx, AV_LOG_ERROR, "cbpz chunk too large (0x%X
bytes)\n", chunk_size);
- return AVERROR_INVALIDDATA;
+ return;
}
/* accumulate partial codebook */
--
1.7.11.1
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
