[MPlayer-dev-eng] libmp1e bugreport

[David Holm]

Ok, just remembered I have write access to libmp1e so I applied it 
myself ;)...
still, I need someone to add the patch in the "dxr3 compat patch" mail...


And to Bohdan Forst:
Checkout the latest mplayer cvs and let me know if it compiles or not...


David Holm wrote:

>Here is the fix for freebsd users. You must checkout a new version of mplayer 
>as well, because the libmp1e/audio dir is no longer used.
>
>Apply this patch to CVS, as well as the patch in my "dxr2 compat patch" mail 
>asap please.
>
>//David Holm
>
>
>------------------------------------------------------------------------
>
>diff -Naur -x CVS main/libmp1e/libmp1e.h main.dev/libmp1e/libmp1e.h
>--- main/libmp1e/libmp1e.h	Wed Dec  5 00:53:53 2001
>+++ main.dev/libmp1e/libmp1e.h	Fri Dec  7 12:36:40 2001
>@@ -192,8 +192,8 @@
>   (off_t)-1 in case of error. This is the same value as lseek returns
>   (see 'man lseek')
> */
>-typedef off64_t (*rteSeekCallback)(rte_context * context,
>-				   off64_t offset,
>+typedef unsigned (*rteSeekCallback)(rte_context * context,
>+				   unsigned offset,
> 				   int whence,
> 				   void * user_data);
> 
>diff -Naur -x CVS main/libmp1e/rte.c main.dev/libmp1e/rte.c
>--- main/libmp1e/rte.c	Wed Dec  5 00:53:53 2001
>+++ main.dev/libmp1e/rte.c	Fri Dec  7 12:37:09 2001
>@@ -213,8 +213,8 @@
> }
> 
> /* The default seek callback */
>-static off64_t default_seek_callback ( rte_context * context,
>-				     off64_t offset,
>+static unsigned default_seek_callback ( rte_context * context,
>+				     unsigned offset,
> 				     int whence,
> 				     void * user_data)
> {
>diff -Naur -x CVS main/libmp1e/rte.h main.dev/libmp1e/rte.h
>--- main/libmp1e/rte.h	Thu Nov 22 20:46:07 2001
>+++ main.dev/libmp1e/rte.h	Fri Dec  7 12:37:26 2001
>@@ -205,8 +205,8 @@
>   (off_t)-1 in case of error. This is the same value as lseek returns
>   (see 'man lseek')
> */
>-typedef off64_t (*rteSeekCallback)(rte_context * context,
>-				   off64_t offset,
>+typedef unsigned (*rteSeekCallback)(rte_context * context,
>+				   unsigned offset,
> 				   int whence,
> 				   void * user_data);
> 
>diff -Naur -x CVS main/libmp1e/rtepriv.h main.dev/libmp1e/rtepriv.h
>--- main/libmp1e/rtepriv.h	Thu Nov 22 20:46:07 2001
>+++ main.dev/libmp1e/rtepriv.h	Wed Dec  5 00:53:53 2001
>@@ -19,13 +19,13 @@
>  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>  */
> /*
>- * $Id: rtepriv.h,v 1.13 2001/11/22 17:51:07 mschimek Exp $
>+ * $Id: rtepriv.h,v 1.1 2001/12/04 23:53:53 mswitch Exp $
>  * Private stuff in the context.
>  */
> 
>-#ifndef __RTEPRIV_H__
>-#define __RTEPRIV_H__
>-#include "rte.h"
>+#ifndef MP1ERTEPRIV_H
>+#define MP1ERTEPRIV_H
>+#include "libmp1e.h"
> #include <pthread.h>
> #include <stdarg.h>
> 
>diff -Naur -x CVS main/libmp1e/video/video.h main.dev/libmp1e/video/video.h
>--- main/libmp1e/video/video.h	Wed Dec  5 00:58:10 2001
>+++ main.dev/libmp1e/video/video.h	Fri Dec  7 12:35:27 2001
>@@ -22,7 +22,8 @@
> #ifndef VIDEO_H
> #define VIDEO_H
> 
>-#include <stdint.h>
>+#include <unistd.h>
>+#include <inttypes.h>
> 
> #include "../common/bstream.h"
> #include "../common/fifo.h"
>