Mercurial > libavformat.hg

changeset 5830:f8093c5208f6 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
export sipr_subpk_size for future use by matroska demuxer
author aurel
date Fri, 12 Mar 2010 23:34:30 +0000
parents 8e97be5c4b94
children 6ff00deb94fb
files rm.h rmdec.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rm.h	Fri Mar 12 05:17:01 2010 +0000
+++ b/rm.h	Fri Mar 12 23:34:30 2010 +0000
@@ -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;
 
--- a/rmdec.c	Fri Mar 12 05:17:01 2010 +0000
+++ b/rmdec.c	Fri Mar 12 23:34:30 2010 +0000
@@ -79,7 +79,7 @@
     { 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 @@
                            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");