1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

* Add patch forgotten to "cvs add" in last commit.

* Bump PORTREVISION.

Noticed by:	lioux
This commit is contained in:
Oliver Braun 2003-02-12 07:17:35 +00:00
parent bcb633199a
commit e6647e93a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=75348
2 changed files with 24 additions and 0 deletions

View File

@ -146,6 +146,7 @@
PORTNAME= mplayer
PORTVERSION= 0.90.0.104
PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \

View File

@ -0,0 +1,23 @@
--- libmpdemux/demux_mov.c.orig Sat Feb 8 11:31:57 2003
+++ libmpdemux/demux_mov.c Sat Feb 8 11:32:29 2003
@@ -597,7 +597,10 @@
unsigned int fourcc=stream_read_dword_le(demuxer->stream);
if(len<8) break; // error
mp_msg(MSGT_DEMUX,MSGL_V,"MOV: %*s desc #%d: %.4s (%d bytes)\n",level,"",i,&fourcc,len-16);
- if(!i){
+ if(fourcc!=trak->fourcc && i)
+ mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVvariableFourCC);
+ //if(!i)
+ {
trak->fourcc=fourcc;
// read type specific (audio/video/time/text etc) header
// NOTE: trak type is not yet known at this point :(((
@@ -605,8 +608,6 @@
trak->stdata=malloc(trak->stdata_len);
stream_read(demuxer->stream,trak->stdata,trak->stdata_len);
}
- if(fourcc!=trak->fourcc && i)
- mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MOVvariableFourCC);
if(!stream_seek(demuxer->stream,pos+len)) break;
}
break;