[FFmpeg-cvslog] r22490 - in trunk/libavformat: rm.h rmdec.c

[aurel]

Author: aurel
Date: Sat Mar 13 00:34:30 2010
New Revision: 22490

Log:
export sipr_subpk_size for future use by matroska demuxer

Modified:
   trunk/libavformat/rm.h
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rm.h
==============================================================================
--- trunk/libavformat/rm.h	Sat Mar 13 00:24:54 2010	(r22489)
+++ trunk/libavformat/rm.h	Sat Mar 13 00:34:30 2010	(r22490)
@@ -25,6 +25,7 @@
 #include "avformat.h"
 
 extern const char * const ff_rm_metadata[4];
+extern const unsigned char ff_sipr_subpk_size[4];
 
 typedef struct RMStream RMStream;
 

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	Sat Mar 13 00:24:54 2010	(r22489)
+++ trunk/libavformat/rmdec.c	Sat Mar 13 00:34:30 2010	(r22490)
@@ -79,7 +79,7 @@ static const unsigned char sipr_swaps[38
     { 67, 83 }, { 77, 80 }
 };
 
-static const unsigned char sipr_subpk_size[4] = { 29, 19, 37, 20 };
+const unsigned char ff_sipr_subpk_size[4] = { 29, 19, 37, 20 };
 
 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
 {
@@ -237,7 +237,7 @@ static int rm_read_audio_stream_info(AVF
                            flavor);
                     return -1;
                 }
-                st->codec->block_align = sipr_subpk_size[flavor];
+                st->codec->block_align = ff_sipr_subpk_size[flavor];
             } else {
                 if(sub_packet_size <= 0){
                     av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n");