[MPlayer-dev-eng] Release schedule [PATCH]

[Dominik 'Rathann' Mierzejewski]

On Tuesday, 27 January 2004 at 20:17, Alex Beregszaszi wrote:
> Hi,
> 
> Pre4 is scheduled on this weekend
> 
> Any not yet committed but worth committing patches out there?

Hmmm, let me see...

I've got one 10l in GUI (patch #1).
Some trivial libfaad2 fixes (patch #2).

Oh, and there's still this issue of unnecessary linking of mplayer and
gmplayer with libmp3lame due to libavcodec's dependency on it.

-- 
MPlayer RPMs maintainer: http://greysector.rangers.eu.org/mplayer.html
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
-------------- next part --------------
--- MPlayer-20040125/Gui/wm/wskeys.h.gui	Sun Jan 25 21:38:36 2004
+++ MPlayer-20040125/Gui/wm/wskeys.h	Sun Jan 25 22:47:20 2004
@@ -151,7 +151,7 @@
 #define wsXFMMVolDown     0xa6
 #define wsXFMMMute        0x99
 
-#define wsKeyNumber 128
+#define wsKeyNumber 130
 
 typedef struct
 {
-------------- next part --------------
--- MPlayer-20040125/libfaad2/error.c.warn	Sun Aug 31 00:30:21 2003
+++ MPlayer-20040125/libfaad2/error.c	Sun Jan 25 22:48:45 2004
@@ -28,7 +28,7 @@
 #include "common.h"
 #include "error.h"
 
-extern int8_t *err_msg[] = {
+int8_t *err_msg[] = {
     "No error",
     "Gain control not yet implemented",
     "Pulse coding not allowed in short blocks",
@@ -46,4 +46,4 @@
     "Input data buffer too small",
     "Array index out of range",
     "Maximum number of scalefactor bands exceeded"
-};
\ No newline at end of file
+};
--- MPlayer-20040125/libfaad2/rvlc.c.warn	Sat Oct 11 01:19:03 2003
+++ MPlayer-20040125/libfaad2/rvlc.c	Sun Jan 25 22:48:45 2004
@@ -511,4 +511,4 @@
     return h->index;
 }
 
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20040125/libfaad2/sbr_noise.h.warn	Sat Oct 11 01:19:03 2003
+++ MPlayer-20040125/libfaad2/sbr_noise.h	Sun Jan 25 22:48:45 2004
@@ -557,4 +557,4 @@
 #ifdef __cplusplus
 
 #endif
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20040125/libfaad2/sbr_qmf_c.h.warn	Sat Oct  4 00:23:26 2003
+++ MPlayer-20040125/libfaad2/sbr_qmf_c.h	Sun Jan 25 22:48:45 2004
@@ -361,4 +361,4 @@
     COEF_CONST(-0.0005617692), COEF_CONST(-0.0005525280)
 };
 
-#endif
\ No newline at end of file
+#endif
--- MPlayer-20040125/libfaad2/sbr_syntax.c.warn	Sat Oct 11 01:19:04 2003
+++ MPlayer-20040125/libfaad2/sbr_syntax.c	Sun Jan 25 22:48:45 2004
@@ -810,4 +810,4 @@
 }
 
 
-#endif /* SBR_DEC */
\ No newline at end of file
+#endif /* SBR_DEC */
--- MPlayer-20040125/libfaad2/huffman.h.warn	Sat Oct 11 01:19:01 2003
+++ MPlayer-20040125/libfaad2/huffman.h	Sun Jan 25 22:48:45 2004
@@ -38,7 +38,7 @@
 static uint8_t huffman_2step_quad(uint8_t cb, bitfile *ld, int16_t *sp);
 static uint8_t huffman_2step_quad_sign(uint8_t cb, bitfile *ld, int16_t *sp);
 static uint8_t huffman_2step_pair(uint8_t cb, bitfile *ld, int16_t *sp);
-static huffman_2step_pair_sign(uint8_t cb, bitfile *ld, int16_t *sp);
+static uint8_t huffman_2step_pair_sign(uint8_t cb, bitfile *ld, int16_t *sp);
 static uint8_t huffman_binary_quad(uint8_t cb, bitfile *ld, int16_t *sp);
 static uint8_t huffman_binary_quad_sign(uint8_t cb, bitfile *ld, int16_t *sp);
 static uint8_t huffman_binary_pair(uint8_t cb, bitfile *ld, int16_t *sp);
--- MPlayer-20040125/libfaad2/huffman.c.warn	Sat Oct  4 00:23:26 2003
+++ MPlayer-20040125/libfaad2/huffman.c	Sun Jan 25 22:48:45 2004
@@ -216,7 +216,7 @@
     return 0;
 }
 
-static huffman_2step_pair_sign(uint8_t cb, bitfile *ld, int16_t *sp)
+static uint8_t huffman_2step_pair_sign(uint8_t cb, bitfile *ld, int16_t *sp)
 {
     uint8_t err = huffman_2step_pair(cb, ld, sp);
     huffman_sign_bits(ld, sp, PAIR_LEN);
--- MPlayer-20040125/libfaad2/sbr_dec.c.warn	Sat Oct 11 01:19:03 2003
+++ MPlayer-20040125/libfaad2/sbr_dec.c	Sun Jan 25 22:48:45 2004
@@ -263,7 +263,7 @@
         {
             /* insert high frequencies here */
             /* hf generation using patching */
-            hf_generation(sbr, sbr->Xcodec[ch], sbr->Xsbr[ch]
+            hf_generation(sbr, (const qmf_t *)(sbr->Xcodec[ch]), sbr->Xsbr[ch]
 #ifdef SBR_LOW_POWER
                 ,deg
 #endif