November 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux muxer.c, 1.10, 1.11 muxer.h, 1.15, 1.16 muxer_avi.c, 1.31, 1.32 muxer_lavf.c, 1.12, 1.13 muxer_mpeg.c, 1.22, 1.23 muxer_rawaudio.c, 1.2, 1.3 muxer_rawvideo.c, 1.5, 1.6
by syncmail＠mplayerhq.hu 21 Nov '05

21 Nov '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv4140/libmpdemux Modified Files: muxer.c muxer.h muxer_avi.c muxer_lavf.c muxer_mpeg.c muxer_rawaudio.c muxer_rawvideo.c Log Message: buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me Index: muxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- muxer.c 18 Nov 2005 14:39:19 -0000 1.10 +++ muxer.c 21 Nov 2005 22:53:14 -0000 1.11 @@ -48,3 +48,105 @@ } return muxer; } + +/* buffer frames until we either: + * (a) have at least one frame from each stream + * (b) run out of memory */ +void muxer_write_chunk(muxer_stream_t *s, size_t len, unsigned int flags) { + if (s->muxer->muxbuf_skip_buffer) { + s->muxer->cont_write_chunk(s, len, flags); + } + else { + int num = s->muxer->muxbuf_num++; + muxbuf_t *buf, *tmp; + + tmp = realloc(s->muxer->muxbuf, (num+1) * sizeof(muxbuf_t)); + if(!tmp) { + mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot reallocate memory!\n"); + return; + } + s->muxer->muxbuf = tmp; + buf = s->muxer->muxbuf + num; + + /* buffer this frame */ + buf->stream = s; + buf->timer = s->timer; + buf->len = len; + buf->flags = flags; + buf->buffer = malloc(len * sizeof (unsigned char)); + if (!buf->buffer) { + mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot allocate memory!\n"); + return; + } + memcpy(buf->buffer, s->buffer, buf->len); + s->muxbuf_seen = 1; + + /* see if we need to keep buffering */ + s->muxer->muxbuf_skip_buffer = 1; + for (num = 0; s->muxer->streams[num]; ++num) + if (!s->muxer->streams[num]->muxbuf_seen) + s->muxer->muxbuf_skip_buffer = 0; + + /* see if we can flush buffer now */ + if (s->muxer->muxbuf_skip_buffer) { + muxbuf_t *tmp_buf = malloc(sizeof(muxbuf_t)); + if (!tmp_buf) { + mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot allocate memory!\n"); + return; + } + mp_msg(MSGT_MUXER, MSGL_V, "Muxer frame buffer sending %d frame(s) to muxer.\n", + s->muxer->muxbuf_num); + + /* fix parameters for all streams */ + for (num = 0; s->muxer->streams[num]; ++num) { + muxer_stream_t *str = s->muxer->streams[num]; + if(str->muxer->fix_stream_parameters) + muxer_stream_fix_parameters(str->muxer, str); + } + + /* write header */ + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingAVIHeader); + if (s->muxer->cont_write_header) + muxer_write_header(s->muxer); + + /* send all buffered frames to muxer */ + for (num = 0; num < s->muxer->muxbuf_num; ++num) { + buf = s->muxer->muxbuf + num; + s = buf->stream; + + /* 1. save timer and buffer (might have changed by now) */ + tmp_buf->timer = s->timer; + tmp_buf->buffer = s->buffer; + + /* 2. move stored timer and buffer into stream and mux it */ + s->timer = buf->timer; + s->buffer = buf->buffer; + s->muxer->cont_write_chunk(s, buf->len, buf->flags); + + /* 3. restore saved timer and buffer */ + s->timer = tmp_buf->timer; + s->buffer = tmp_buf->buffer; + } + free(tmp_buf); + + free(s->muxer->muxbuf); + s->muxer->muxbuf_num = 0; + } + } + + /* this code moved directly from muxer_avi.c */ + // alter counters: + if(s->h.dwSampleSize){ + // CBR + s->h.dwLength+=len/s->h.dwSampleSize; + if(len%s->h.dwSampleSize) mp_msg(MSGT_MUXER, MSGL_WARN, "Warning! len isn't divisable by samplesize!\n"); + } else { + // VBR + s->h.dwLength++; + } + s->timer=(double)s->h.dwLength*s->h.dwScale/s->h.dwRate; + s->size+=len; + + return; +} + Index: muxer.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- muxer.h 19 Jun 2005 09:12:43 -0000 1.15 +++ muxer.h 21 Nov 2005 22:53:14 -0000 1.16 @@ -28,6 +28,8 @@ unsigned int b_buffer_size; //size of b_buffer unsigned int b_buffer_ptr; //index to next data to write unsigned int b_buffer_len; //len of next data to write + // muxer frame buffer: + unsigned int muxbuf_seen; // source stream: void* source; // sh_audio or sh_video int codec; // codec used for encoding. 0 means copy @@ -37,7 +39,6 @@ WAVEFORMATEX *wf; BITMAPINFOHEADER *bih; // in format // mpeg specific: - unsigned int gop_start; // frame number of this GOP start size_t ipb[3]; // sizes of I/P/B frames // muxer of that stream struct muxer_t *muxer; @@ -66,6 +67,11 @@ //int num_streams; muxer_stream_t* def_v; // default video stream (for general headers) muxer_stream_t* streams[MUXER_MAX_STREAMS]; + // muxer frame buffer: + struct muxbuf_t * muxbuf; + int muxbuf_num; + int muxbuf_skip_buffer; + // functions: void (*fix_stream_parameters)(muxer_stream_t *); void (*cont_write_chunk)(muxer_stream_t *,size_t,unsigned int); void (*cont_write_header)(struct muxer_t *); @@ -75,10 +81,20 @@ void *priv; } muxer_t; +/* muxer frame buffer */ +typedef struct muxbuf_t { + muxer_stream_t *stream; /* pointer back to corresponding stream */ + double timer; /* snapshot of stream timer */ + unsigned char *buffer; + size_t len; + unsigned int flags; +} muxbuf_t; + + muxer_t *muxer_new_muxer(int type,FILE *); #define muxer_new_stream(muxer,a) muxer->cont_new_stream(muxer,a) #define muxer_stream_fix_parameters(muxer, a) muxer->fix_stream_parameters(a) -#define muxer_write_chunk(a,b,c) a->muxer->cont_write_chunk(a,b,c) +void muxer_write_chunk(muxer_stream_t *s, size_t len, unsigned int flags); #define muxer_write_header(muxer) muxer->cont_write_header(muxer) #define muxer_write_index(muxer) muxer->cont_write_index(muxer) Index: muxer_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- muxer_avi.c 18 Nov 2005 14:39:19 -0000 1.31 +++ muxer_avi.c 21 Nov 2005 22:53:14 -0000 1.32 @@ -241,20 +241,9 @@ // write out the chunk: write_avi_chunk(muxer->file,s->ckid,len,s->buffer); /* unsigned char */ - // alter counters: if (len > s->h.dwSuggestedBufferSize){ s->h.dwSuggestedBufferSize = len; } - if(s->h.dwSampleSize){ - // CBR - s->h.dwLength+=len/s->h.dwSampleSize; - if(len%s->h.dwSampleSize) mp_msg(MSGT_MUXER, MSGL_WARN, "Warning! len isn't divisable by samplesize!\n"); - } else { - // VBR - s->h.dwLength++; - } - s->timer=(double)s->h.dwLength*s->h.dwScale/s->h.dwRate; - s->size+=len; if((unsigned int)len>s->h.dwSuggestedBufferSize) s->h.dwSuggestedBufferSize=len; muxer->file_end += 8 + paddedlen; Index: muxer_lavf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- muxer_lavf.c 18 Nov 2005 14:39:19 -0000 1.12 +++ muxer_lavf.c 21 Nov 2005 22:53:14 -0000 1.13 @@ -103,6 +103,7 @@ mp_msg(MSGT_MUXER, MSGL_ERR, "Could not alloc muxer_stream, EXIT\n"); return NULL; } + muxer->streams[muxer->avih.dwStreams] = stream; stream->b_buffer = (unsigned char *)malloc(2048); if(!stream->b_buffer) { @@ -230,8 +231,6 @@ muxer_stream_priv_t *spriv = (muxer_stream_priv_t *) stream->priv; AVPacket pkt; - stream->size += len; - if(len) { av_init_packet(&pkt); @@ -259,12 +258,6 @@ } } - if(stream->h.dwSampleSize) // CBR - stream->h.dwLength += len / stream->h.dwSampleSize; - else // VBR - stream->h.dwLength++; - - stream->timer = (double) stream->h.dwLength * stream->h.dwScale / stream->h.dwRate; return; } Index: muxer_mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- muxer_mpeg.c 18 Nov 2005 14:39:19 -0000 1.22 +++ muxer_mpeg.c 21 Nov 2005 22:53:14 -0000 1.23 @@ -1991,7 +1991,6 @@ if(s->buffer[3]) { // Sequence or GOP -- scan for Picture - s->gop_start = s->h.dwLength; while (ptr < len-5 && (s->buffer[ptr] != 0 || s->buffer[ptr+1] != 0 || s->buffer[ptr+2] != 1 || s->buffer[ptr+3] != 0)) ptr++; @@ -2454,10 +2453,8 @@ priv->vbytes += len; sz <<= 1; - s->h.dwLength++; - s->size += len; - s->timer = (double)s->h.dwLength*s->h.dwScale/s->h.dwRate; } else { // MUXER_TYPE_AUDIO + double fake_timer; spriv->type = 0; stream_format = s->wf->wFormatTag; @@ -2522,9 +2519,7 @@ } } - parse_audio(s, 0, &nf, &(s->timer)); - s->h.dwLength += nf; - s->size += len; + parse_audio(s, 0, &nf, &fake_timer); sz = max(len, 2 * priv->packet_size); } @@ -2557,12 +2552,13 @@ static void mpegfile_write_index(muxer_t *muxer) { int i, nf; + double fake_timer; muxer_priv_t *priv = (muxer_priv_t *) muxer->priv; for(i = 0; i < muxer->avih.dwStreams; i++) { if(muxer->streams[i]->type == MUXER_TYPE_AUDIO) - parse_audio(muxer->streams[i], 1, &nf, &(muxer->streams[i]->timer)); + parse_audio(muxer->streams[i], 1, &nf, &fake_timer); } while(flush_buffers(muxer, 0) > 0); flush_buffers(muxer, 1); Index: muxer_rawaudio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_rawaudio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- muxer_rawaudio.c 20 Jun 2005 00:30:18 -0000 1.2 +++ muxer_rawaudio.c 21 Nov 2005 22:53:14 -0000 1.3 @@ -51,19 +51,6 @@ // write out the chunk: if (s->type==MUXER_TYPE_AUDIO) fwrite(s->buffer,len,1,muxer->file); - - // alter counters: - if(s->h.dwSampleSize){ - // CBR - s->h.dwLength+=len/s->h.dwSampleSize; - if(len%s->h.dwSampleSize) - mp_msg(MSGT_MUXER,MSGL_WARN,MSGTR_WarningLenIsntDivisible); - } else { - // VBR - s->h.dwLength++; - } - s->timer=(double)s->h.dwLength*s->h.dwScale/s->h.dwRate; - s->size+=len; } static void rawaudiofile_write_header(muxer_t *muxer){ Index: muxer_rawvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_rawvideo.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- muxer_rawvideo.c 18 Nov 2005 14:39:19 -0000 1.5 +++ muxer_rawvideo.c 21 Nov 2005 22:53:14 -0000 1.6 @@ -57,17 +57,6 @@ if (s->type == MUXER_TYPE_VIDEO) write_rawvideo_chunk(muxer->file,len,s->buffer); /* unsigned char */ - // alter counters: - if(s->h.dwSampleSize){ - // CBR - s->h.dwLength+=len/s->h.dwSampleSize; - if(len%s->h.dwSampleSize) printf("Warning! len isn't divisable by samplesize!\n"); - } else { - // VBR - s->h.dwLength++; - } - s->timer=(double)s->h.dwLength*s->h.dwScale/s->h.dwRate; - s->size+=len; // if((unsigned int)len>s->h.dwSuggestedBufferSize) s->h.dwSuggestedBufferSize=len; }

1 0

CVS: main/debian changelog,1.32,1.33
by syncmail＠mplayerhq.hu 21 Nov '05

21 Nov '05

CVS change done by Guillaume Poirier CVS Update of /cvsroot/mplayer/main/debian In directory mail:/var2/tmp/cvs-serv24885/debian Modified Files: changelog Log Message: Mentions that --enable-runtime-cpudetection is not on by default. Index: changelog =================================================================== RCS file: /cvsroot/mplayer/main/debian/changelog,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- changelog 17 Feb 2004 00:57:08 -0000 1.32 +++ changelog 21 Nov 2005 21:17:27 -0000 1.33 @@ -1,8 +1,10 @@ mplayer (1.0cvs) unstable; urgency=low - * this is a placeholder message + * debian/rules: now compiled without --enable-runtime-cpudetection. + If you plan to install the target .deb on a wide variety of machines, + you may want to add that option to the configure command. - -- Gabucino <gabucino(a)mplayerhq.hu> Tue, 17 Feb 2004 01:56:40 +0100 + -- Guillaume POIRIER <gpoirier(a)mplayerhq.hu> Mon, 20 Nov 2005 22:56:40 +0100 mplayer (0.90cvs) unstable; urgency=low

1 0

CVS: main mplayer.c,1.888,1.889
by syncmail＠mplayerhq.hu 20 Nov '05

20 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv26418 Modified Files: mplayer.c Log Message: Make the osd command only switch between enabled/disabled when using the term osd. Also put a define to test for the term osd without #ifdef. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.888 retrieving revision 1.889 diff -u -r1.888 -r1.889 --- mplayer.c 16 Nov 2005 16:51:48 -0000 1.888 +++ mplayer.c 20 Nov 2005 23:44:46 -0000 1.889 @@ -225,6 +225,7 @@ #endif #define MAX_OSD_LEVEL 3 +#define MAX_TERM_OSD_LEVEL 1 int osd_level=1; int osd_level_saved=-1; @@ -1150,6 +1151,14 @@ return NULL; } +// Make a define to test if we are using the term osd without having +// to #ifdef USE_OSD all the time. +#ifdef USE_OSD +#define use_term_osd (term_osd && !sh_video) +#else +#define use_term_osd (term_osd) +#endif + /** * \brief Display the OSD bar. * @@ -2966,11 +2975,7 @@ // small hack to display the pause message in the osd line // The pause string is: "\n == PAUSE == \r" so we need to // take the first and the last char out -#ifdef USE_OSD - if(term_osd && !sh_video) { -#else - if(term_osd) { -#endif + if(use_term_osd) { char msg[128] = MSGTR_Paused; int mlen = strlen(msg); msg[mlen-1] = '\0'; @@ -3232,10 +3237,12 @@ } break; case MP_CMD_OSD : { int v = cmd->args[0].v.i; + int max = use_term_osd ? MAX_TERM_OSD_LEVEL : MAX_OSD_LEVEL; + if(osd_level > max) osd_level = max; if(v < 0) - osd_level=(osd_level+1)%(MAX_OSD_LEVEL+1); + osd_level=(osd_level+1)%(max+1); else - osd_level= v > MAX_OSD_LEVEL ? MAX_OSD_LEVEL : v; + osd_level= v > max ? max : v; /* Show OSD state when disabled, but not when an explicit argument is given to the osd command, i.e. in slave mode. */ if (v == -1 && osd_level <= 1)

1 0

CVS: main/libmpdemux cache2.c, 1.30, 1.31 cdda.c, 1.20, 1.21 cddb.c, 1.20, 1.21 cue_read.c, 1.11, 1.12 demux_asf.c, 1.35, 1.36 demux_audio.c, 1.41, 1.42 demux_mkv.c, 1.52, 1.53 demux_mov.c, 1.133, 1.134 demux_ogg.c, 1.83, 1.84 demux_rawaudio.c, 1.14, 1.15 demux_rawvideo.c, 1.9, 1.10 demux_ts.c, 1.39, 1.40 demux_ty.c, 1.10, 1.11 demux_ty_osd.c, 1.4, 1.5 demux_vqf.c, 1.5, 1.6 demux_xmms.c, 1.13, 1.14 demuxer.c, 1.209, 1.210 dvb_tune.c, 1.12, 1.13 dvbin.c, 1.15, 1.16 dvdnav_stream.c, 1.4, 1.5
by syncmail＠mplayerhq.hu 19 Nov '05

19 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv31333/libmpdemux Modified Files: cache2.c cdda.c cddb.c cue_read.c demux_asf.c demux_audio.c demux_mkv.c demux_mov.c demux_ogg.c demux_rawaudio.c demux_rawvideo.c demux_ts.c demux_ty.c demux_ty_osd.c demux_vqf.c demux_xmms.c demuxer.c dvb_tune.c dvbin.c dvdnav_stream.c mf.c mp3_hdr.c muxer.c muxer_avi.c muxer_lavf.c muxer_mpeg.c muxer_rawvideo.c network.c open.c stream.c stream.h stream_dvd.c stream_file.c stream_ftp.c stream_netstream.c stream_smb.c stream_vcd.c stream_vstream.c test.c tv.c tv.h tvi_bsdbt848.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c video.c Log Message: Unify include path handling, -I.. is in CFLAGS. Index: cache2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- cache2.c 27 Oct 2005 06:55:05 -0000 1.30 +++ cache2.c 18 Nov 2005 14:39:18 -0000 1.31 @@ -17,10 +17,10 @@ #include <sys/types.h> #include <unistd.h> -#include "../osdep/timer.h" +#include "osdep/timer.h" #ifndef WIN32 #include <sys/wait.h> -#include "../osdep/shmem.h" +#include "osdep/shmem.h" #else #include <windows.h> static DWORD WINAPI ThreadProc(void* s); Index: cdda.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cdda.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cdda.c 10 Nov 2005 21:33:12 -0000 1.20 +++ cdda.c 18 Nov 2005 14:39:18 -0000 1.21 @@ -3,9 +3,9 @@ #ifdef HAVE_CDDA #include "stream.h" -#include "../m_option.h" -#include "../m_struct.h" -#include "../bswap.h" +#include "m_option.h" +#include "m_struct.h" +#include "bswap.h" #include <stdio.h> #include <stdlib.h> Index: cddb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cddb.c 10 Nov 2005 21:33:12 -0000 1.20 +++ cddb.c 18 Nov 2005 14:39:18 -0000 1.21 @@ -48,7 +48,7 @@ #endif #include "cdd.h" -#include "../version.h" +#include "version.h" #include "stream.h" #include "network.h" Index: cue_read.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cue_read.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cue_read.c 10 Nov 2005 21:33:12 -0000 1.11 +++ cue_read.c 18 Nov 2005 14:39:18 -0000 1.12 @@ -17,8 +17,8 @@ #include "cue_read.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" #define byte unsigned char #define SIZERAW 2352 Index: demux_asf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- demux_asf.c 30 Oct 2005 09:19:05 -0000 1.35 +++ demux_asf.c 18 Nov 2005 14:39:18 -0000 1.36 @@ -12,7 +12,7 @@ #include "asf.h" #include "demuxer.h" -#include "../libvo/fastmemcpy.h" +#include "libvo/fastmemcpy.h" /* * Load 16/32-bit values in little endian byte order Index: demux_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- demux_audio.c 30 Oct 2005 09:19:05 -0000 1.41 +++ demux_audio.c 18 Nov 2005 14:39:18 -0000 1.42 @@ -1,6 +1,6 @@ #include "config.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include <stdlib.h> #include <stdio.h> Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- demux_mkv.c 5 Nov 2005 04:56:23 -0000 1.52 +++ demux_mkv.c 18 Nov 2005 14:39:18 -0000 1.53 @@ -20,8 +20,8 @@ #include "matroska.h" #include "bswap.h" -#include "../subreader.h" -#include "../libvo/sub.h" +#include "subreader.h" +#include "libvo/sub.h" #ifdef USE_QTX_CODECS #include "qtx/qtxsdk/components.h" @@ -34,7 +34,7 @@ #ifdef USE_LIBLZO #include <lzo1x.h> #else -#include "../libmpcodecs/native/minilzo.h" +#include "libmpcodecs/native/minilzo.h" #endif #if !defined(MIN) Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- demux_mov.c 5 Oct 2005 14:55:06 -0000 1.133 +++ demux_mov.c 18 Nov 2005 14:39:18 -0000 1.134 @@ -40,7 +40,7 @@ #include <QuickTime/ImageCompression.h> #include <QuickTime/ImageCodec.h> #else -#include "../loader/qtx/qtxsdk/components.h" +#include "loader/qtx/qtxsdk/components.h" #endif #ifdef HAVE_ZLIB Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- demux_ogg.c 5 Nov 2005 11:58:25 -0000 1.83 +++ demux_ogg.c 18 Nov 2005 14:39:18 -0000 1.84 @@ -9,8 +9,8 @@ #include <assert.h> #include <math.h> -#include "../mp_msg.h" -#include "../help_mp.h" +#include "mp_msg.h" +#include "help_mp.h" #include "stream.h" #include "demuxer.h" #include "stheader.h" @@ -161,8 +161,8 @@ //-------- subtitle support - should be moved to decoder layer, and queue // - subtitles up in demuxer buffer... -#include "../subreader.h" -#include "../libvo/sub.h" +#include "subreader.h" +#include "libvo/sub.h" #define OGG_SUB_MAX_LINE 128 static subtitle ogg_sub; Index: demux_rawaudio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawaudio.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- demux_rawaudio.c 30 Oct 2005 09:19:05 -0000 1.14 +++ demux_rawaudio.c 18 Nov 2005 14:39:19 -0000 1.15 @@ -6,7 +6,7 @@ #include <unistd.h> #include <string.h> -#include "../m_option.h" +#include "m_option.h" #include "stream.h" #include "demuxer.h" Index: demux_rawvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawvideo.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demux_rawvideo.c 25 Sep 2005 17:29:45 -0000 1.9 +++ demux_rawvideo.c 18 Nov 2005 14:39:19 -0000 1.10 @@ -6,13 +6,13 @@ #include <unistd.h> #include <string.h> -#include "../m_option.h" +#include "m_option.h" #include "stream.h" #include "demuxer.h" #include "stheader.h" -#include "../libmpcodecs/img_format.h" +#include "libmpcodecs/img_format.h" extern int demuxer_type; static int format = IMGFMT_I420; Index: demux_ts.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- demux_ts.c 6 Nov 2005 16:17:17 -0000 1.39 +++ demux_ts.c 18 Nov 2005 14:39:19 -0000 1.40 @@ -35,7 +35,7 @@ #include "stheader.h" #include "bswap.h" -#include "../unrarlib.h" +#include "unrarlib.h" #include "ms_hdr.h" #include "mpeg_hdr.h" Index: demux_ty.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- demux_ty.c 30 Oct 2005 09:19:05 -0000 1.10 +++ demux_ty.c 18 Nov 2005 14:39:19 -0000 1.11 @@ -43,7 +43,7 @@ #include "demuxer.h" #include "parse_es.h" #include "stheader.h" -#include "../sub_cc.h" +#include "sub_cc.h" extern void skip_audio_frame( sh_audio_t *sh_audio ); extern int sub_justify; Index: demux_ty_osd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty_osd.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_ty_osd.c 4 Oct 2003 17:29:01 -0000 1.4 +++ demux_ty_osd.c 18 Nov 2005 14:39:19 -0000 1.5 @@ -22,9 +22,9 @@ //#include "parse_es.h" //#include "stheader.h" //#include "mp3_hdr.h" -//#include "../subreader.h" -#include "../sub_cc.h" -#include "../libvo/sub.h" +//#include "subreader.h" +#include "sub_cc.h" +#include "libvo/sub.h" //#include "dvdauth.h" Index: demux_vqf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_vqf.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- demux_vqf.c 30 Oct 2005 09:19:05 -0000 1.5 +++ demux_vqf.c 18 Nov 2005 14:39:19 -0000 1.6 @@ -7,7 +7,7 @@ #include "stream.h" #include "demuxer.h" #include "stheader.h" -#include "../libmpcodecs/vqf.h" +#include "libmpcodecs/vqf.h" static int demux_probe_vqf(demuxer_t* demuxer) { Index: demux_xmms.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_xmms.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- demux_xmms.c 30 Oct 2005 09:19:05 -0000 1.13 +++ demux_xmms.c 18 Nov 2005 14:39:19 -0000 1.14 @@ -12,8 +12,8 @@ #include <string.h> #include <sys/stat.h> -#include "../m_option.h" -#include "../libaf/af_format.h" +#include "m_option.h" +#include "libaf/af_format.h" #include "stream.h" #include "demuxer.h" #include "stheader.h" Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- demuxer.c 6 Nov 2005 14:14:53 -0000 1.209 +++ demuxer.c 18 Nov 2005 14:39:19 -0000 1.210 @@ -11,15 +11,15 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" -#include "../m_config.h" +#include "m_config.h" #include "stream.h" #include "demuxer.h" #include "stheader.h" #include "mf.h" -#include "../libaf/af_format.h" -#include "../libvo/fastmemcpy.h" +#include "libaf/af_format.h" +#include "libvo/fastmemcpy.h" extern void resync_audio_stream(sh_audio_t *sh_audio); Index: dvb_tune.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvb_tune.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dvb_tune.c 16 Apr 2005 12:51:09 -0000 1.12 +++ dvb_tune.c 18 Nov 2005 14:39:19 -0000 1.13 @@ -53,7 +53,7 @@ #endif #include "dvbin.h" -#include "../mp_msg.h" +#include "mp_msg.h" Index: dvbin.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvbin.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dvbin.c 18 Sep 2005 19:17:23 -0000 1.15 +++ dvbin.c 18 Nov 2005 14:39:19 -0000 1.16 @@ -44,8 +44,8 @@ #include "stream.h" #include "demuxer.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" #include "dvbin.h" Index: dvdnav_stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/dvdnav_stream.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dvdnav_stream.c 19 May 2005 19:50:39 -0000 1.4 +++ dvdnav_stream.c 18 Nov 2005 14:39:19 -0000 1.5 @@ -7,14 +7,14 @@ #include <unistd.h> #include <string.h> #include "mp_msg.h" -#include "../osdep/timer.h" -#include "../input/input.h" +#include "osdep/timer.h" +#include "input/input.h" #include "stream.h" #include "dvdnav_stream.h" -#include "../libvo/video_out.h" -#include "../spudec.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "libvo/video_out.h" +#include "spudec.h" +#include "m_option.h" +#include "m_struct.h" static struct stream_priv_s { int track; Index: mf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/mf.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mf.c 25 Apr 2003 10:20:15 -0000 1.9 +++ mf.c 18 Nov 2005 14:39:19 -0000 1.10 @@ -14,7 +14,7 @@ #ifdef HAVE_GLOB #include <glob.h> #else -#include "../osdep/glob.h" +#include "osdep/glob.h" #endif #include "mp_msg.h" Index: mp3_hdr.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/mp3_hdr.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mp3_hdr.c 1 Aug 2005 18:36:50 -0000 1.12 +++ mp3_hdr.c 18 Nov 2005 14:39:19 -0000 1.13 @@ -1,7 +1,7 @@ #include <stdio.h> #include "config.h" -#include "../mp_msg.h" +#include "mp_msg.h" //----------------------- mp3 audio frame header parser ----------------------- Index: muxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- muxer.c 21 Jun 2005 18:54:50 -0000 1.9 +++ muxer.c 18 Nov 2005 14:39:19 -0000 1.10 @@ -6,7 +6,7 @@ #include <unistd.h> #include "config.h" -#include "../version.h" +#include "version.h" #include "aviheader.h" #include "ms_hdr.h" Index: muxer_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- muxer_avi.c 21 Feb 2005 21:45:49 -0000 1.30 +++ muxer_avi.c 18 Nov 2005 14:39:19 -0000 1.31 @@ -6,7 +6,7 @@ #include <limits.h> #include "config.h" -#include "../version.h" +#include "version.h" #include "stream.h" #include "demuxer.h" Index: muxer_lavf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- muxer_lavf.c 13 Oct 2005 18:33:56 -0000 1.11 +++ muxer_lavf.c 18 Nov 2005 14:39:19 -0000 1.12 @@ -4,8 +4,8 @@ #include <sys/types.h> #include <inttypes.h> #include "config.h" -#include "../version.h" -#include "../mp_msg.h" +#include "version.h" +#include "mp_msg.h" #include "bswap.h" #include "aviheader.h" @@ -15,7 +15,7 @@ #include "stream.h" #include "demuxer.h" #include "stheader.h" -#include "../m_option.h" +#include "m_option.h" #include "avformat.h" extern unsigned int codec_get_wav_tag(int id); Index: muxer_mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- muxer_mpeg.c 13 Oct 2005 18:33:56 -0000 1.21 +++ muxer_mpeg.c 18 Nov 2005 14:39:19 -0000 1.22 @@ -5,8 +5,8 @@ #include <sys/types.h> #include "config.h" -#include "../version.h" -#include "../mp_msg.h" +#include "version.h" +#include "mp_msg.h" #include "bswap.h" @@ -17,7 +17,7 @@ #include "stream.h" #include "demuxer.h" #include "stheader.h" -#include "../m_option.h" +#include "m_option.h" #include "mpeg_hdr.h" #define PACK_HEADER_START_CODE 0x01ba Index: muxer_rawvideo.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_rawvideo.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- muxer_rawvideo.c 19 Oct 2005 05:44:27 -0000 1.4 +++ muxer_rawvideo.c 18 Nov 2005 14:39:19 -0000 1.5 @@ -6,7 +6,7 @@ #include <unistd.h> #include "config.h" -#include "../version.h" +#include "version.h" //#include "stream.h" //#include "demuxer.h" Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- network.c 13 Oct 2005 18:33:56 -0000 1.118 +++ network.c 18 Nov 2005 14:39:19 -0000 1.119 @@ -25,14 +25,14 @@ #include "stream.h" #include "demuxer.h" -#include "../m_config.h" +#include "m_config.h" #include "network.h" #include "http.h" #include "cookies.h" #include "url.h" -#include "../version.h" +#include "version.h" extern int verbose; extern int stream_cache_size; Index: open.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- open.c 29 May 2005 12:53:59 -0000 1.109 +++ open.c 18 Nov 2005 14:39:19 -0000 1.110 @@ -15,7 +15,7 @@ #include <sys/cdrio.h> #endif -#include "../m_option.h" +#include "m_option.h" #include "stream.h" #include "demuxer.h" #include "mf.h" Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- stream.c 18 Oct 2005 11:11:25 -0000 1.82 +++ stream.c 18 Nov 2005 14:39:20 -0000 1.83 @@ -23,13 +23,13 @@ #include "mp_msg.h" #include "help_mp.h" -#include "../osdep/shmem.h" +#include "osdep/shmem.h" #include "stream.h" #include "demuxer.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" extern int verbose; // defined in mplayer.c Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- stream.h 10 Jul 2005 14:09:45 -0000 1.72 +++ stream.h 18 Nov 2005 14:39:20 -0000 1.73 @@ -275,15 +275,15 @@ #ifdef USE_MPDVDKIT #if (USE_MPDVDKIT == 2) -#include "../libmpdvdkit2/dvd_reader.h" -#include "../libmpdvdkit2/ifo_types.h" -#include "../libmpdvdkit2/ifo_read.h" -#include "../libmpdvdkit2/nav_read.h" +#include "libmpdvdkit2/dvd_reader.h" +#include "libmpdvdkit2/ifo_types.h" +#include "libmpdvdkit2/ifo_read.h" +#include "libmpdvdkit2/nav_read.h" #else -#include "../libmpdvdkit/dvd_reader.h" -#include "../libmpdvdkit/ifo_types.h" -#include "../libmpdvdkit/ifo_read.h" -#include "../libmpdvdkit/nav_read.h" +#include "libmpdvdkit/dvd_reader.h" +#include "libmpdvdkit/ifo_types.h" +#include "libmpdvdkit/ifo_read.h" +#include "libmpdvdkit/nav_read.h" #endif #else #include <dvdread/dvd_reader.h> Index: stream_dvd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_dvd.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- stream_dvd.c 18 Oct 2005 11:11:25 -0000 1.6 +++ stream_dvd.c 18 Nov 2005 14:39:20 -0000 1.7 @@ -22,8 +22,8 @@ #define FIRST_PCM_AID 160 #include "stream.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" /// We keep these 2 for the gui atm, but they will be removed. int dvd_title=0; Index: stream_file.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_file.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- stream_file.c 13 Oct 2005 18:33:56 -0000 1.10 +++ stream_file.c 18 Nov 2005 14:39:20 -0000 1.11 @@ -10,8 +10,8 @@ #include "mp_msg.h" #include "stream.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" static struct stream_priv_s { char* filename; Index: stream_ftp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_ftp.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- stream_ftp.c 14 Oct 2005 12:35:30 -0000 1.7 +++ stream_ftp.c 18 Nov 2005 14:39:20 -0000 1.8 @@ -21,8 +21,8 @@ #include "mp_msg.h" #include "stream.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" static struct stream_priv_s { char* user; Index: stream_netstream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_netstream.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- stream_netstream.c 31 Aug 2003 18:51:05 -0000 1.7 +++ stream_netstream.c 18 Nov 2005 14:39:20 -0000 1.8 @@ -60,9 +60,9 @@ #include "mp_msg.h" #include "stream.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" -#include "../bswap.h" +#include "m_option.h" +#include "m_struct.h" +#include "bswap.h" #include "netstream.h" Index: stream_smb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_smb.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stream_smb.c 19 May 2005 21:47:30 -0000 1.2 +++ stream_smb.c 18 Nov 2005 14:39:20 -0000 1.3 @@ -9,8 +9,8 @@ #include "mp_msg.h" #include "stream.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" static struct stream_priv_s { } stream_priv_dflts = { Index: stream_vcd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_vcd.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- stream_vcd.c 3 Jul 2005 15:20:14 -0000 1.9 +++ stream_vcd.c 18 Nov 2005 14:39:20 -0000 1.10 @@ -5,8 +5,8 @@ #include "mp_msg.h" #include "stream.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" #include <fcntl.h> #include <stdlib.h> Index: stream_vstream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_vstream.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- stream_vstream.c 27 Feb 2005 05:53:12 -0000 1.1 +++ stream_vstream.c 18 Nov 2005 14:39:20 -0000 1.2 @@ -51,8 +51,8 @@ #include "mp_msg.h" #include "stream.h" #include "help_mp.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" #include <vstream-client.h> Index: test.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- test.c 30 Mar 2003 17:14:41 -0000 1.11 +++ test.c 18 Nov 2005 14:39:20 -0000 1.12 @@ -25,7 +25,7 @@ } // for libmpdvdkit2: -#include "../get_path.c" +#include "get_path.c" int verbose=5; // must be global! Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- tv.c 10 Nov 2005 20:31:27 -0000 1.75 +++ tv.c 18 Nov 2005 14:39:20 -0000 1.76 @@ -29,9 +29,9 @@ #include "demuxer.h" #include "stheader.h" -#include "../libaf/af_format.h" -#include "../libvo/img_format.h" -#include "../libvo/fastmemcpy.h" +#include "libaf/af_format.h" +#include "libvo/img_format.h" +#include "libvo/fastmemcpy.h" #include "tv.h" Index: tv.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- tv.h 29 Jan 2005 12:24:43 -0000 1.30 +++ tv.h 18 Nov 2005 14:39:20 -0000 1.31 @@ -4,9 +4,9 @@ extern int tv_param_on; #ifdef USE_TV -//#include "../libao2/afmt.h" -//#include "../libvo/img_format.h" -//#include "../libvo/fastmemcpy.h" +//#include "libao2/afmt.h" +//#include "libvo/img_format.h" +//#include "libvo/fastmemcpy.h" //#include "mp_msg.h" extern char *tv_param_freq; Index: tvi_bsdbt848.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tvi_bsdbt848.c 25 May 2005 08:48:32 -0000 1.16 +++ tvi_bsdbt848.c 18 Nov 2005 14:39:20 -0000 1.17 @@ -64,8 +64,8 @@ #endif #endif -#include "../libaf/af_format.h" -#include "../libvo/img_format.h" +#include "libaf/af_format.h" +#include "libvo/img_format.h" #include "tv.h" /* information about this file */ Index: tvi_dummy.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_dummy.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tvi_dummy.c 1 May 2004 18:30:38 -0000 1.11 +++ tvi_dummy.c 18 Nov 2005 14:39:20 -0000 1.12 @@ -7,7 +7,7 @@ #ifdef USE_TV #include <stdio.h> -#include "../libvo/img_format.h" +#include "libvo/img_format.h" #include "tv.h" /* information about this file */ Index: tvi_v4l.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- tvi_v4l.c 19 Aug 2005 14:28:30 -0000 1.74 +++ tvi_v4l.c 18 Nov 2005 14:39:20 -0000 1.75 @@ -41,10 +41,10 @@ #endif #include "mp_msg.h" -#include "../libaf/af_format.h" -#include "../libvo/img_format.h" -#include "../libvo/fastmemcpy.h" -#include "../libvo/videodev_mjpeg.h" +#include "libaf/af_format.h" +#include "libvo/img_format.h" +#include "libvo/fastmemcpy.h" +#include "libvo/videodev_mjpeg.h" #include "tv.h" Index: tvi_v4l2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- tvi_v4l2.c 10 Nov 2005 20:32:47 -0000 1.33 +++ tvi_v4l2.c 18 Nov 2005 14:39:20 -0000 1.34 @@ -42,9 +42,9 @@ #endif #include <linux/types.h> #include <linux/videodev2.h> -#include "../mp_msg.h" -#include "../libvo/img_format.h" -#include "../libaf/af_format.h" +#include "mp_msg.h" +#include "libvo/img_format.h" +#include "libaf/af_format.h" #include "tv.h" #include "audio_in.h" Index: video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- video.c 17 Sep 2005 18:36:43 -0000 1.54 +++ video.c 18 Nov 2005 14:39:21 -0000 1.55 @@ -20,7 +20,7 @@ #include "mpeg_hdr.h" /* sub_cc (closed captions)*/ -#include "../sub_cc.h" +#include "sub_cc.h" /* biCompression constant */ #define BI_RGB 0L

4 6

CVS: main/loader win32.c,1.104,1.105
by syncmail＠mplayerhq.hu 19 Nov '05

19 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/loader In directory mail:/var2/tmp/cvs-serv21388/loader Modified Files: win32.c Log Message: Unify include paths, -I.. is in CFLAGS. Index: win32.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/win32.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- win32.c 3 Oct 2005 19:11:55 -0000 1.104 +++ win32.c 19 Nov 2005 14:35:45 -0000 1.105 @@ -189,7 +189,7 @@ } #ifdef MPLAYER -#include "../mp_msg.h" +#include "mp_msg.h" #endif int LOADER_DEBUG=1; // active only if compiled with -DDETAILED_OUT //#define DETAILED_OUT @@ -959,7 +959,7 @@ #ifdef MPLAYER /* mplayer's way to detect PF's */ { -#include "../cpudetect.h" +#include "cpudetect.h" extern CpuCaps gCpuCaps; if (gCpuCaps.hasMMX)

1 0

CVS: main/libao2 ao_oss.c,1.55,1.56
by syncmail＠mplayerhq.hu 19 Nov '05

19 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv21388/libao2 Modified Files: ao_oss.c Log Message: Unify include paths, -I.. is in CFLAGS. Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ao_oss.c 10 Nov 2005 09:02:56 -0000 1.55 +++ ao_oss.c 19 Nov 2005 14:35:45 -0000 1.56 @@ -23,7 +23,7 @@ #endif #endif -#include "../libaf/af_format.h" +#include "libaf/af_format.h" #include "audio_out.h" #include "audio_out_internal.h"

1 0

CVS: main/libvo gl_common.c,1.34,1.35
by syncmail＠mplayerhq.hu 19 Nov '05

19 Nov '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv13892 Modified Files: gl_common.c Log Message: Also parse glX extension string, makes -vo gl:swapinterval work again on linux Index: gl_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gl_common.c 13 Nov 2005 21:53:26 -0000 1.34 +++ gl_common.c 19 Nov 2005 14:00:35 -0000 1.35 @@ -249,9 +249,13 @@ /** * \brief find the function pointers of some useful OpenGL extensions * \param getProcAddress function to resolve function names, may be NULL + * \param ext2 an extra extension string */ -static void getFunctions(void *(*getProcAddress)(const GLubyte *)) { +static void getFunctions(void *(*getProcAddress)(const GLubyte *), + const char *ext2) { const char *extensions = glGetString(GL_EXTENSIONS); + if (!extensions) extensions = ""; + if (!ext2) ext2 = ""; if (!getProcAddress) getProcAddress = setNull; GenBuffers = getProcAddress("glGenBuffers"); @@ -324,7 +328,7 @@ ProgramEnvParameter4f = getProcAddress("glProgramEnvParameter4fARB"); if (!ProgramEnvParameter4f) ProgramEnvParameter4f = getProcAddress("glProgramEnvParameter4fNV"); - if (!extensions || !strstr(extensions, "_swap_control")) + if (!strstr(extensions, "_swap_control") && !strstr(ext2, "_swap_control")) SwapInterval = NULL; else { SwapInterval = getProcAddress("glXSwapInterval"); @@ -1003,7 +1007,7 @@ wglDeleteContext(*context); *context = new_context; *vinfo = new_vinfo; - getFunctions(w32gpa); + getFunctions(w32gpa, NULL); // and inform that reinit is neccessary return SET_WINDOW_REINIT; @@ -1117,6 +1121,7 @@ } if (!keep_context) { void *(*getProcAddress)(const GLubyte *); + const char *(*glXExtStr)(Display *, int); if (*context) glXDestroyContext(mDisplay, *context); *context = new_context; @@ -1128,7 +1133,9 @@ getProcAddress = getdladdr("glXGetProcAddressARB"); if (!getProcAddress) getProcAddress = getdladdr; - getFunctions(getProcAddress); + glXExtStr = getdladdr("glXQueryExtensionsString"); + getFunctions(getProcAddress, !glXExtStr ? NULL : + glXExtStr(mDisplay, DefaultScreen(mDisplay))); // and inform that reinit is neccessary return SET_WINDOW_REINIT;

1 0

CVS: main/DOCS/tech mpcf.txt,1.84,1.85
by syncmail＠mplayerhq.hu 18 Nov '05

18 Nov '05

CVS change done by Alexander Strasser (beastd) Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv31574/DOCS/tech Modified Files: mpcf.txt Log Message: Change MUST to SHOULD have disposition and if applicable language tags. Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- mpcf.txt 23 Oct 2005 16:50:27 -0000 1.84 +++ mpcf.txt 18 Nov 2005 16:28:26 -0000 1.85 @@ -1,5 +1,5 @@ ======================================== -NUT Open Container Format DRAFT 20050909 +NUT Open Container Format DRAFT 20051118 ======================================== @@ -654,8 +654,9 @@ Semantic requirements: ====================== -If more than one stream of a given stream class is present, each one MUST +If more than one stream of a given stream class is present, each one SHOULD have info tags specifying disposition, and if applicable, language. +It often highly improves usability and is therefore strongly encouraged. A demuxer MUST NOT demux a stream which contains more than one stream, or which is wrapped in a structure to facilitate more than one stream or otherwise

1 0

CVS: main/TOOLS/netstream netstream.c,1.9,1.10
by syncmail＠mplayerhq.hu 18 Nov '05

18 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/TOOLS/netstream In directory mail:/var2/tmp/cvs-serv3609/netstream Modified Files: netstream.c Log Message: Unify include path handling by using -I. Index: netstream.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/netstream/netstream.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netstream.c 31 Jul 2005 00:26:06 -0000 1.9 +++ netstream.c 18 Nov 2005 16:16:33 -0000 1.10 @@ -396,7 +396,7 @@ } // for libmpdvdkit2: -#include "../get_path.c" +#include "get_path.c" int verbose=0;

1 0

CVS: main/TOOLS avi-fix.c, 1.2, 1.3 fastmemcpybench.c, 1.7, 1.8
by syncmail＠mplayerhq.hu 18 Nov '05

18 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var2/tmp/cvs-serv3609 Modified Files: avi-fix.c fastmemcpybench.c Log Message: Unify include path handling by using -I. Index: avi-fix.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/avi-fix.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- avi-fix.c 16 Aug 2005 18:19:06 -0000 1.2 +++ avi-fix.c 18 Nov 2005 16:16:33 -0000 1.3 @@ -2,7 +2,7 @@ // simple tool to fix chunk sizes in a RIFF AVI file // it doesn't check/fix index, use mencoder -forceidx -oac copy -ovc copy to fix index! -#include "../config.h" +#include "config.h" #ifdef MP_DEBUG #define mp_debug(...) printf(__VA_ARGS__) #else Index: fastmemcpybench.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/fastmemcpybench.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fastmemcpybench.c 1 Nov 2004 14:46:57 -0000 1.7 +++ fastmemcpybench.c 18 Nov 2005 16:16:33 -0000 1.8 @@ -17,14 +17,14 @@ #include <sys/time.h> #include <inttypes.h> -#include "../libvo/fastmemcpy.h" +#include "libvo/fastmemcpy.h" //#define ARR_SIZE 100000 #define ARR_SIZE (1024*768*2) #ifdef HAVE_MGA -#include "../drivers/mga_vid.h" +#include "drivers/mga_vid.h" static int mga_next_frame=0;

1 0