generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

export sipr_subpk_size for future use by matroska demuxer

Browse Source 
Originally committed as revision 22490 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2010-03-12 23:34:30 +00:00
parent 2325bdad7b
commit adae9fa65e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/rm.h
View File

@@ -25,6 +25,7 @@
#include "avformat.h" #include "avformat.h"
extern const char * const ff_rm_metadata[4]; extern const char * const ff_rm_metadata[4];
extern const unsigned char ff_sipr_subpk_size[4];
typedef struct RMStream RMStream; typedef struct RMStream RMStream;

4
libavformat/rmdec.c
View File

@@ -79,7 +79,7 @@ static const unsigned char sipr_swaps[38][2] = {
{ 67, 83 }, { 77, 80 } { 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) 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); flavor);
return -1; return -1;
} }
st->codec->block_align = sipr_subpk_size[flavor]; st->codec->block_align = ff_sipr_subpk_size[flavor];
} else { } else {
if(sub_packet_size <= 0){ if(sub_packet_size <= 0){
av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n"); av_log(s, AV_LOG_ERROR, "sub_packet_size is invalid\n");