update to 1.0pre7

some relevant changes:
-RTSP/MMST security patches now in main distribution
-documentation improvements
-x86_64 support fixes
-integrated Tremor decoder for Ogg/Vorbis
-expose support for 422P and 444P raw formats
-dropped support of old FAAD2 versions (<= 1.1)
-support for 32 bit float and extended WAV files
-support for multichannel WAV files
-ALAC (QuickTime lossless audio) support via lavc
-vqf demuxer
-support for Real multirate files
-more user-friendly info about audio and subtitle tracks in Ogg files
-streaming improvements
-ffmpeg updates
-MEncoder usability improvements
-many fixes and cleanups

3 files changed, 4 insertions, 43 deletions

diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
index 2d158c0252b..51389c92ed6 100644
--- a/multimedia/mplayer-share/patches/patch-ad
+++ b/multimedia/mplayer-share/patches/patch-ad
@@ -1,16 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2004/07/17 19:06:36 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2005/04/18 17:49:41 drochner Exp $
 
---- mp_msg.c.orig	2003-09-12 17:46:16.000000000 +0200
+--- mp_msg.c.orig	2005-01-20 14:22:52.000000000 +0100
 +++ mp_msg.c
-@@ -34,6 +34,7 @@ void mp_msg_init(){
+@@ -34,15 +34,19 @@ void mp_msg_init(){
  #ifdef MP_DEBUG
      fprintf(stdout, "Using GNU internationalization\n");
      fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
 +#if 0
      fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
  #endif
-     setlocale(LC_ALL, ""); /* set from the environment variables */
-@@ -41,9 +42,12 @@ void mp_msg_init(){
+     bindtextdomain("mplayer", PREFIX"/share/locale");
      textdomain("mplayer");
  #ifdef MP_DEBUG
      fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
diff --git a/multimedia/mplayer-share/patches/patch-ba b/multimedia/mplayer-share/patches/patch-ba
deleted file mode 100644
index 04a9f0cce6f..00000000000
--- a/multimedia/mplayer-share/patches/patch-ba
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2005/04/16 17:43:09 drochner Exp $
-
---- libmpdemux/realrtsp/rtsp.c.orig	2005-04-16 21:08:44.000000000 +0200
-+++ libmpdemux/realrtsp/rtsp.c
-@@ -397,6 +397,7 @@ static int rtsp_get_answers(rtsp_t *s) {
-   unsigned int answer_seq;
-   char **answer_ptr=s->answers;
-   int code;
-+  int ans_count = 0;
-   
-   answer=rtsp_get(s);
-   if (!answer)
-@@ -448,7 +449,7 @@ static int rtsp_get_answers(rtsp_t *s) {
-     }
-     *answer_ptr=answer;
-     answer_ptr++;
--  } while (strlen(answer)!=0);
-+  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-   
-   s->cseq++;
-   
diff --git a/multimedia/mplayer-share/patches/patch-bb b/multimedia/mplayer-share/patches/patch-bb
deleted file mode 100644
index ab078d1180c..00000000000
--- a/multimedia/mplayer-share/patches/patch-bb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2005/04/16 17:43:09 drochner Exp $
-
---- libmpdemux/asf_mmst_streaming.c.orig	2005-04-16 21:10:36.000000000 +0200
-+++ libmpdemux/asf_mmst_streaming.c
-@@ -334,8 +334,12 @@ static int interp_header (uint8_t *heade
- 
-       printf ("stream object, stream id: %d\n", stream_id);
- 
-+      if (num_stream_ids < 20) {
-       stream_ids[num_stream_ids] = stream_id;
-       num_stream_ids++;
-+      } else {
-+	printf ("too many id, stream skipped");
-+      }
-       
-     } else {
-       printf ("unknown object\n");