cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two bug-fixes.

Browse Source 
- allows realmedia streams to work.
- fix af resample=wrongvalue.

Okay pvalchev@
This commit is contained in:
espie 2005-08-27 21:11:49 +00:00
parent 2d00f98957
commit d36666f229
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.87 2005/08/12 22:59:15 espie Exp $
# $OpenBSD: Makefile,v 1.88 2005/08/27 21:11:49 espie Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
@ -7,7 +7,7 @@ COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
DISTNAME= MPlayer-1.0pre7
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p3
PKGNAME= ${DISTNAME:L}p4
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2

32
x11/mplayer/patches/patch-libaf_af_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-libaf_af_c,v 1.1 2005/08/27 21:11:49 espie Exp $
--- libaf/af.c.orig Sat Aug 27 13:31:21 2005
+++ libaf/af.c Sat Aug 27 13:39:50 2005
@@ -378,7 +378,7 @@ int af_init(af_stream_t* s, int force_ou
if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
af_instance_t* af = NULL; // New filter
// Check output frequency if not OK fix with resample
- if(s->last->data->rate!=s->output.rate){
+ if(!s->last || s->last->data->rate!=s->output.rate){
// try to find a filter that can change samplrate
af = af_control_any_rev(s, AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET,
&(s->output.rate));
@@ -395,7 +395,7 @@ int af_init(af_stream_t* s, int force_ou
af = af_prepend(s,s->first,resampler);
}
else{
- if(!strcmp(s->last->info->name,"format"))
+ if(s->last && !strcmp(s->last->info->name,"format"))
af = af_prepend(s,s->last,resampler);
else
af = af_append(s,s->last,resampler);
@@ -423,8 +423,8 @@ int af_init(af_stream_t* s, int force_ou
// Check number of output channels fix if not OK
// If needed always inserted last -> easy to screw up other filters
- if(s->last->data->nch!=s->output.nch){
- if(!strcmp(s->last->info->name,"format"))
+ if(!s->last || s->last->data->nch!=s->output.nch){
+ if(s->last && !strcmp(s->last->info->name,"format"))
af = af_prepend(s,s->last,"channels");
else
af = af_append(s,s->last,"channels");

12
x11/mplayer/patches/patch-libmpdemux_realrtsp_rtsp_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libmpdemux_realrtsp_rtsp_c,v 1.2 2005/08/27 21:11:49 espie Exp $
--- libmpdemux/realrtsp/rtsp.c.orig Sat Aug 27 13:09:55 2005
+++ libmpdemux/realrtsp/rtsp.c Sat Aug 27 13:10:08 2005
@@ -274,7 +274,7 @@ static char *rtsp_get(rtsp_t *s) {
while (n<BUF_SIZE) {
read_stream(s->s, &(buffer[n]), 1);
- if ((buffer[n-1]==0x0d)&&(buffer[n]==0x0a)) break;
+ if (n > 0 &&(buffer[n-1]==0x0d)&&(buffer[n]==0x0a)) break;
n++;
}