export sipr_subpk_size for future use by matroska demuxer

Originally committed as revision 22490 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rm.h b/libavformat/rm.h
index 68207e1..9838cb7 100644 (file)
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -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;
 

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index be01286..a3f46ab 100644 (file)
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -79,7 +79,7 @@ static const unsigned char sipr_swaps[38][2] = {
     { 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(AVFormatContext *s, ByteIOContext *pb,
                            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");