[SCM] mplayer packaging branch, etch, updated. 7476e04ba26079b38fc67353c8a73fa9bc612630

[siretart at users.alioth.debian.org]

The following commit has been merged in the etch branch:
commit 7476e04ba26079b38fc67353c8a73fa9bc612630
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 17 20:16:01 2009 +0200

    update patch for CVE-2008-4866
    
    Compare and revert to patch to the one that was actually applied in the
    ffmpeg package.

diff --git a/debian/patches/CVE-2008-4866.patch b/debian/patches/CVE-2008-4866.patch
index 4865150..43858ec 100644
--- a/debian/patches/CVE-2008-4866.patch
+++ b/debian/patches/CVE-2008-4866.patch
@@ -8,20 +8,13 @@ r14714 | bcoudurier | 2008-08-12 19:26:36 +0200 (Di, 12. Aug 2008) | 3 lines
 Prevent dts generation code to be executed when delay is > MAX_REORDER_DELAY,
 this fixes overflow in AVStream->pts_buffer.
 
-However, this patch seems to be adjusted. By whom is unknown, though.
 
---- ../old/mplayer-1.0~rc1/libavformat/utils.c	2006-10-22 22:32:34.000000000 +0000
-+++ mplayer-1.0~rc1/libavformat/utils.c	2009-04-13 10:52:14.000000000 +0000
-@@ -647,10 +647,14 @@
- static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
-                                AVCodecParserContext *pc, AVPacket *pkt)
- {
--    int num, den, presentation_delayed;
-+    int num, den, presentation_delayed, delay;
-+
-+    /* do we have a video B-frame ? */
-+    delay= st->codec->has_b_frames;
-+
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index efe0755..f18aa82 100644
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -650,7 +650,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
+     int num, den, presentation_delayed;
      /* handle wrapping */
      if(st->cur_dts != AV_NOPTS_VALUE){
 -        if(pkt->pts != AV_NOPTS_VALUE)
@@ -29,7 +22,7 @@ However, this patch seems to be adjusted. By whom is unknown, though.
              pkt->pts= lsb2full(pkt->pts, st->cur_dts, st->pts_wrap_bits);
          if(pkt->dts != AV_NOPTS_VALUE)
              pkt->dts= lsb2full(pkt->dts, st->cur_dts, st->pts_wrap_bits);
-@@ -2225,7 +2229,7 @@
+@@ -2225,7 +2225,7 @@ static int compute_pkt_fields2(AVStream *st, AVPacket *pkt){
      }
  
      //calculate dts from pts
diff --git a/libavformat/utils.c b/libavformat/utils.c
index a10cde6..f18aa82 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -647,11 +647,7 @@ static int64_t lsb2full(int64_t lsb, int64_t last_ts, int lsb_bits){
 static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
                                AVCodecParserContext *pc, AVPacket *pkt)
 {
-    int num, den, presentation_delayed, delay;
-
-    /* do we have a video B-frame ? */
-    delay= st->codec->has_b_frames;
-
+    int num, den, presentation_delayed;
     /* handle wrapping */
     if(st->cur_dts != AV_NOPTS_VALUE){
         if(pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY)

-- 
mplayer packaging