[SCM] mplayer packaging branch, etch, updated. 4e1925ff908fc79c33fa7856ef782eb50e66f6de

[siretart at users.alioth.debian.org]

The following commit has been merged in the etch branch:
commit 4e1925ff908fc79c33fa7856ef782eb50e66f6de
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 19 10:28:09 2009 +0200

    update patch for CVE-2008-4866 again.
    
    AFAIUI, the first hunk doesn't apply because the code in question has
    been largely rewritten. Remove that hunk.

diff --git a/debian/patches/CVE-2008-4866.patch b/debian/patches/CVE-2008-4866.patch
index 43858ec..50a147b 100644
--- a/debian/patches/CVE-2008-4866.patch
+++ b/debian/patches/CVE-2008-4866.patch
@@ -10,18 +10,9 @@ this fixes overflow in AVStream->pts_buffer.
 
 
 diff --git a/libavformat/utils.c b/libavformat/utils.c
-index efe0755..f18aa82 100644
+index efe0755..e36ff87 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)
-+        if(pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY)
-             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 +2225,7 @@ static int compute_pkt_fields2(AVStream *st, AVPacket *pkt){
      }
  
diff --git a/libavformat/utils.c b/libavformat/utils.c
index f18aa82..e36ff87 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 && delay <= MAX_REORDER_DELAY)
+        if(pkt->pts != AV_NOPTS_VALUE)
             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);

-- 
mplayer packaging