Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 12 insertions, 0 deletions

diff --git a/src/input/libreal/rmff.h b/src/input/libreal/rmff.h
index 010ee5154..3fe3af284 100644
--- a/src/input/libreal/rmff.h
+++ b/src/input/libreal/rmff.h
@@ -39,6 +39,12 @@
 
 #define RMFF_HEADER_SIZE 0x12
 
+#define RMFF_FILEHEADER_SIZE 18
+#define RMFF_PROPHEADER_SIZE 50
+#define RMFF_MDPRHEADER_SIZE 46
+#define RMFF_CONTHEADER_SIZE 18
+#define RMFF_DATAHEADER_SIZE 18
+
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
         (((long)(unsigned char)(ch3)       ) | \
         ( (long)(unsigned char)(ch2) << 8  ) | \
@@ -216,6 +222,7 @@ rmff_data_t *rmff_new_dataheader(
  */
 rmff_header_t *rmff_scan_header(const char *data);
 
+#if 0
 /*
  * scans a data packet header. Notice, that this function does not allocate
  * the header struct itself.
@@ -231,16 +238,19 @@ rmff_header_t *rmff_scan_header_stream(int fd);
  * prints header information in human readible form to stdout
  */
 void rmff_print_header(rmff_header_t *h);
+#endif
 
 /*
  * does some checks and fixes header if possible
  */
 void rmff_fix_header(rmff_header_t *h);
 
+#if 0
 /*
  * returns the size of the header (incl. first data-header)
  */
 int rmff_get_header_size(rmff_header_t *h);
+#endif
  
 /*
  * dumps the header <h> to <buffer>. <max> is the size of <buffer>
@@ -252,9 +262,11 @@ int rmff_dump_header(rmff_header_t *h, void *buffer, int max);
  */
 void rmff_dump_pheader(rmff_pheader_t *h, uint8_t *data);
 
+#if 0
 /*
  * frees a header struct
  */
 void rmff_free_header(rmff_header_t *h);
+#endif
 
 #endif