Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=7a3dde3d2fd99b30e89537fa18f745435e4eac13
commit 7a3dde3d2fd99b30e89537fa18f745435e4eac13 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Mar 8 13:20:02 2009 +0100 mplayer-1.0rc2-7solaria3-i686 - add ffmpeg-r16846.patch - closes #3600 Conflicts: source/xapps/mplayer/FrugalBuild diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index 830d713..1e9203d 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -5,7 +5,7 @@ pkgname=mplayer _F_archive_name=MPlayer pkgver=1.0rc2 pkgextraver= -pkgrel=7solaria2 +pkgrel=7solaria3 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/"; depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \ @@ -33,7 +33,8 @@ source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver$pkgext CVE-2008-0073.diff \ http://www.ocert.org/patches/2008-013/mplayer_demux_real.patch \ fix-for-vqf-demuxer-crashes.patch \ - ivtv_2.6.24.patch) + ivtv_2.6.24.patch \ + ffmpeg-r16846.patch) sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \ '45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \ 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \ @@ -47,7 +48,8 @@ sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \ 'df2d0c46a73be32ec5e3d575532c34b939a79d5f' \ '3139c1c13d411cbacef9a9d050c9df87431aba71' \ '19f886cddc59a6f7ef5b9c4c1cdb731ec481fe13' \ - 'dbb1eab7de79cbff3a15eeb8acbe34a853800afa') + 'dbb1eab7de79cbff3a15eeb8acbe34a853800afa' \ + 'e4c28fa466118d07a3f7d8376b725eda2e196e21') # To add v4l support. # mknod -m 660 /dev/video0 c 81 0 diff --git a/source/xapps/mplayer/ffmpeg-r16846.patch b/source/xapps/mplayer/ffmpeg-r16846.patch new file mode 100644 index 0000000..374ce33 --- /dev/null +++ b/source/xapps/mplayer/ffmpeg-r16846.patch @@ -0,0 +1,19 @@ +diff --git a/libavformat/4xm.c b/libavformat/4xm.c +index 151e9c9..41b4834 100644 +--- a/libavformat/4xm.c ++++ b/libavformat/4xm.c +@@ -163,10 +163,12 @@ static int fourxm_read_header(AVFormatContext *s, + return AVERROR_INVALIDDATA; + } + current_track = AV_RL32(&header[i + 8]); ++ if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) -1) { ++ av_log(s, AV_LOG_ERROR, "current_track too large\n"); ++ return -1; ++ } + if (current_track + 1 > fourxm->track_count) { + fourxm->track_count = current_track + 1; +- if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)) +- return -1; + fourxm->tracks = av_realloc(fourxm->tracks, + fourxm->track_count * sizeof(AudioTrack)); + if (!fourxm->tracks) { _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
