From adae9fa65e69dd5ac1c5d411fcc66affb554c79b Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Fri, 12 Mar 2010 23:34:30 +0000 Subject: [PATCH] export sipr_subpk_size for future use by matroska demuxer Originally committed as revision 22490 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rm.h | 1 + libavformat/rmdec.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/rm.h b/libavformat/rm.h index 68207e1fe1..9838cb7f29 100644 --- 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 be01286695..a3f46abac2 100644 --- 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");