old

(Portage version: 2.1.6.2/cvs/Linux 2.6.27.7 i686)

4 files changed, 0 insertions, 126 deletions

diff --git a/media-video/ffmpeg/files/CVE-2008-3162.patch b/media-video/ffmpeg/files/CVE-2008-3162.patch
deleted file mode 100644
index 032a3e7016b3..000000000000
--- a/media-video/ffmpeg/files/CVE-2008-3162.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-CVE-2008-3162:
-Stack-based buffer overflow in the str_read_packet function in libavformat/psxstr.c
-in FFmpeg before r13993 allows remote attackers to cause a denial of service 
-(application crash) or execute arbitrary code via a crafted STR file that interleaves
-audio and video sectors.
-
-Patch from
-http://svn.mplayerhq.hu/ffmpeg?view=rev&revision=13993
-
-Index: ffmpeg/libavformat/psxstr.c
-===================================================================
---- ffmpeg.orig/libavformat/psxstr.c
-+++ ffmpeg/libavformat/psxstr.c
-@@ -276,12 +276,23 @@ static int str_read_packet(AVFormatConte
-                 int current_sector = AV_RL16(&sector[0x1C]);
-                 int sector_count   = AV_RL16(&sector[0x1E]);
-                 int frame_size = AV_RL32(&sector[0x24]);
--                int bytes_to_copy;
-+
-+                if(!(   frame_size>=0
-+                     && current_sector < sector_count
-+                     && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){
-+                    av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", current_sector, sector_count, frame_size);
-+                    return AVERROR_INVALIDDATA;
-+                }
-+
- //        printf("%d %d %d\n",current_sector,sector_count,frame_size);
-                 /* if this is the first sector of the frame, allocate a pkt */
-                 pkt = &str->tmp_pkt;
--                if (current_sector == 0) {
--                    if (av_new_packet(pkt, frame_size))
-+
-+                if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){
-+                    if(pkt->data)
-+                        av_log(s, AV_LOG_ERROR, "missmatching sector_count\n");
-+                    av_free_packet(pkt);
-+                    if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE))
-                         return AVERROR_IO;
- 
-                     pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
-@@ -295,15 +306,15 @@ static int str_read_packet(AVFormatConte
-                        str->pts += (90000 / 15);
-                 }
- 
--                /* load all the constituent chunks in the video packet */
--                bytes_to_copy = frame_size - current_sector*VIDEO_DATA_CHUNK_SIZE;
--                if (bytes_to_copy>0) {
--                    if (bytes_to_copy>VIDEO_DATA_CHUNK_SIZE) bytes_to_copy=VIDEO_DATA_CHUNK_SIZE;
--                    memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
--                        sector + VIDEO_DATA_HEADER_SIZE, bytes_to_copy);
--                }
-+                memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
-+                       sector + VIDEO_DATA_HEADER_SIZE,
-+                       VIDEO_DATA_CHUNK_SIZE);
-+
-                 if (current_sector == sector_count-1) {
-+                    pkt->size= frame_size;
-                     *ret_pkt = *pkt;
-+                    pkt->data= NULL;
-+                    pkt->size= -1;
-                     return 0;
-                 }
- 
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch
deleted file mode 100644
index 0cf16c3e5cca..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: ffmpeg/libavcodec/cabac.h
-===================================================================
---- ffmpeg.orig/libavcodec/cabac.h
-+++ ffmpeg/libavcodec/cabac.h
-@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_in
- #define BYTE        "16"
- #define BYTEEND     "20"
- #endif
--#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
-+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
-     int bit;
- 
- #ifndef BRANCHLESS_CABAC_DECODER
-@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_by
- 
- //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
- //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
--#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
-+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
- static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
-     void *end= significant_coeff_ctx_base + max_coeff - 1;
-     int minusstart= -(int)significant_coeff_ctx_base;
-Index: ffmpeg/libavcodec/h264.c
-===================================================================
---- ffmpeg.orig/libavcodec/h264.c
-+++ ffmpeg/libavcodec/h264.c
-@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Co
-             index[coeff_count++] = last;\
-         }
-         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
--#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
-+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
-         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
-     } else {
-         coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
diff --git a/media-video/ffmpeg/files/ffmpeg-arm-pld.patch b/media-video/ffmpeg/files/ffmpeg-arm-pld.patch
deleted file mode 100644
index 5b8a2ce9cf87..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-arm-pld.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-fix from upstream svn
---- ffmpeg/libavcodec/armv4l/dsputil_arm_s.S	(revision 12568)
-+++ ffmpeg/libavcodec/armv4l/dsputil_arm_s.S	(revision 12569)
-@@ -19,6 +19,13 @@
- @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- @
- 
-+#include "config.h"
-+
-+#ifndef HAVE_PLD
-+.macro pld reg
-+.endm
-+#endif
-+
- .macro  ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
-         mov \Rd0, \Rn0, lsr #(\shift * 8)
-         mov \Rd1, \Rn1, lsr #(\shift * 8)
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch b/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch
deleted file mode 100644
index ca3f202b4029..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-libdir-2007.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/configure.orig	2007-01-29 15:24:05.000000000 +0100
-+++ ffmpeg/configure	2007-01-29 15:37:23.000000000 +0100
-@@ -2166,7 +2166,7 @@
- cat <<EOF >$name.pc
- prefix=$PREFIX
- exec_prefix=\${prefix}
--libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/GENTOOLIBDIR
- includedir=\${prefix}/include
- 
- Name: $name