Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26307
Modified Files:
libavcodec54-1.0-shlibs.info
Added Files:
libavcodec54-1.0-shlibs-h264_error_value.patch
Log Message:
ffmpeg 1.0.2
Index: libavcodec54-1.0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libavcodec54-1.0-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libavcodec54-1.0-shlibs.info 5 Dec 2012 14:57:36 -0000 1.2
+++ libavcodec54-1.0-shlibs.info 21 Jan 2013 23:11:03 -0000 1.3
@@ -1,5 +1,5 @@
Package: libavcodec54-1.0-shlibs
-Version: 1.0.1
+Version: 1.0.2
Revision: 1
BuildDepends: <<
bzip2,
@@ -31,7 +31,7 @@
sdl,
system-openssl-dev,
texi2html,
- twolame-dev,
+ twolame-dev (>= 0.3.13-1),
x11-dev,
xvidcore,
yasm
@@ -62,13 +62,16 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
xvidcore-shlibs
<<
###
Source: http://ffmpeg.org/releases/ffmpeg-%v.tar.bz2
-Source-MD5: dbbb88ce5525dea22b24aaa098a9bcc2
+Source-MD5: a7efff0f149aa2b6e6f7595b0544ee20
###
+### h264_error_value patch needed for 1.0.2. Fixed in 1.0.3 on.
+PatchFile: %N-h264_error_value.patch
+PatchFile-MD5: ad9d415f9feccfc49cd9bf2a1b3c90ae
PatchScript: <<
#!/bin/sh -ev
%{default_script}
@@ -218,7 +221,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -292,7 +295,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -358,7 +361,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -426,7 +429,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -493,7 +496,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -560,7 +563,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -627,7 +630,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -697,7 +700,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
@@ -746,7 +749,7 @@
libvorbis0-shlibs,
libx264-118-shlibs (>= 0.0.20111013-1),
sdl-shlibs,
- twolame-shlibs,
+ twolame-shlibs (>= 0.3.13-1),
x11-shlibs,
xvidcore-shlibs
<<
--- NEW FILE: libavcodec54-1.0-shlibs-h264_error_value.patch ---
>From 5ee483ae62663361833d70263cd4d626ba280452 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <an...@khirnov.net>
Date: Mon, 14 Jan 2013 20:07:53 +0100
Subject: [PATCH] h264: fix ff_generate_sliding_window_mmcos() prototype.
It's been returning an error value since
bad446e251405dc250c3cbee199072e083a1e4b9
Also check for the errors it returns.
(cherry picked from commit ea382767ad2191acbe97e90624059723e15f0e4b)
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
---
libavcodec/h264.c | 6 ++++--
libavcodec/h264.h | 2 +-
libavcodec/h264_refs.c | 12 ++++++++----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c8c3974..e28cc63 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2360,7 +2360,7 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
MpegEncContext *const s0 = &h0->s;
unsigned int first_mb_in_slice;
unsigned int pps_id;
- int num_ref_idx_active_override_flag;
+ int num_ref_idx_active_override_flag, ret;
unsigned int slice_type, tmp, i, j;
int default_ref_list_done = 0;
int last_pic_structure, last_pic_dropable;
@@ -2795,7 +2795,9 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
s->current_picture_ptr->frame_num = h->prev_frame_num;
ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 0);
ff_thread_report_progress(&s->current_picture_ptr->f, INT_MAX, 1);
- ff_generate_sliding_window_mmcos(h, 1);
+ if ((ret = ff_generate_sliding_window_mmcos(h, 1)) < 0 &&
+ s->avctx->err_recognition & AV_EF_EXPLODE)
+ return ret;
if (ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index) < 0
&&
(s->avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA;
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index c3052bb..65d1fd8 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -671,7 +671,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO
*mmco, int mmco_count);
int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
int first_slice);
-void ff_generate_sliding_window_mmcos(H264Context *h, int first_slice);
+int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice);
/**
* Check if the top & left blocks are available if needed & change the
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 46e11eb..20058c2 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -492,7 +492,7 @@ static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int
n_mmcos)
return 0;
}
-void ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
+int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
{
MpegEncContext * const s = &h->s;
MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
@@ -523,6 +523,7 @@ void ff_generate_sliding_window_mmcos(H264Context *h, int
first_slice)
mmco_index, h->mmco_index, i);
return AVERROR_INVALIDDATA;
}
+ return 0;
}
int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int
mmco_count){
@@ -696,7 +697,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h,
GetBitContext *gb,
int first_slice)
{
MpegEncContext * const s = &h->s;
- int i;
+ int i, ret;
MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
int mmco_index = 0;
@@ -753,8 +754,11 @@ int ff_h264_decode_ref_pic_marking(H264Context *h,
GetBitContext *gb,
}
mmco_index = i;
} else {
- if (first_slice)
- ff_generate_sliding_window_mmcos(h, first_slice);
+ if (first_slice) {
+ ret = ff_generate_sliding_window_mmcos(h, first_slice);
+ if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE)
+ return ret;
+ }
mmco_index = -1;
}
}
--
1.7.11.1
>From 78526c279fddc9f497e65ef937783e7c8519102e Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michae...@gmx.at>
Date: Mon, 21 Jan 2013 23:00:20 +0100
Subject: [PATCH] avf_showwaves: fix null pointer dereference
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit e4eebc2da9da886e1bdf87d29e9a4c5b55111036)
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
---
libavfilter/avf_showwaves.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index dcbe8b8..81ee74d 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -220,6 +220,7 @@ static int filter_samples(AVFilterLink *inlink,
AVFilterBufferRef *insamples)
}
if (showwaves->buf_idx == showwaves->w)
push_frame(outlink);
+ outpicref = showwaves->outpicref;
}
avfilter_unref_buffer(insamples);
--
1.7.11.1
>From bec97981badcaf5f632ddd043bf016c4f3f18361 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michae...@gmx.at>
Date: Sun, 20 Jan 2013 20:02:35 +0100
Subject: [PATCH] h264/ff_generate_sliding_window_mmcos: fix use of
uninitialized variable
Fixes CID968587
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 3fba3e79a3e46d7611817f9051b33885eb1ff962)
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
---
libavcodec/h264_refs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 20058c2..9e9f9e6 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -519,8 +519,8 @@ int ff_generate_sliding_window_mmcos(H264Context *h, int
first_slice)
(mmco_index != h->mmco_index ||
(i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
av_log(h->s.avctx, AV_LOG_ERROR,
- "Inconsistent MMCO state between slices [%d, %d, %d]\n",
- mmco_index, h->mmco_index, i);
+ "Inconsistent MMCO state between slices [%d, %d]\n",
+ mmco_index, h->mmco_index);
return AVERROR_INVALIDDATA;
}
return 0;
--
1.7.11.1
>From 75aa373bec58dd65cca6006a04c89c03d935ec83 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michae...@gmx.at>
Date: Sun, 20 Jan 2013 20:01:39 +0100
Subject: [PATCH] h264: print mismatching opcode details in check_opcodes()
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit dcbe15813ed09cf491e75a21cce0e751f5bc2b34)
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
---
libavcodec/h264_refs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 9e9f9e6..d5b9633 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -485,8 +485,11 @@ static int check_opcodes(MMCO *mmco1, MMCO *mmco2, int
n_mmcos)
int i;
for (i = 0; i < n_mmcos; i++) {
- if (mmco1[i].opcode != mmco2[i].opcode)
+ if (mmco1[i].opcode != mmco2[i].opcode) {
+ av_log(NULL, AV_LOG_ERROR, "MMCO opcode [%d, %d] at %d mismatches
between slices\n",
+ mmco1[i].opcode, mmco2[i].opcode, i);
return -1;
+ }
}
return 0;
--
1.7.11.1
>From 7ca4b918989c614de0e2dce1df45929aba5ab29d Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michae...@gmx.at>
Date: Sun, 20 Jan 2013 19:50:33 +0100
Subject: [PATCH] h264: fix use of uninitialized variable
Fixed CID968588
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit fc86f88b32a288b252a088ee3c77b4f6219d54d5)
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
---
libavcodec/h264_refs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index d5b9633..e5c008c 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -772,8 +772,8 @@ int ff_h264_decode_ref_pic_marking(H264Context *h,
GetBitContext *gb,
(mmco_index != h->mmco_index ||
(i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
av_log(h->s.avctx, AV_LOG_ERROR,
- "Inconsistent MMCO state between slices [%d, %d, %d]\n",
- mmco_index, h->mmco_index, i);
+ "Inconsistent MMCO state between slices [%d, %d]\n",
+ mmco_index, h->mmco_index);
return AVERROR_INVALIDDATA;
}
--
1.7.11.1
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122412
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
