diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:19:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:20:46 +0200 |
| commit | 9270a2b374eae02c3588ff9a36af298d19f006c8 (patch) | |
| tree | bce36468c80d453d10fbe2385711b7a5b2c8ce41 /libavformat/rm.h | |
| parent | 36b3b2376dd99e035f5acc389f8c506647146e14 (diff) | |
| parent | 4c995fafd861f537360b3717901cdbed6a6844e7 (diff) | |
| download | ffmpeg-9270a2b374eae02c3588ff9a36af298d19f006c8.tar.gz | |
Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'
* commit '4c995fafd861f537360b3717901cdbed6a6844e7':
configure: simplify get_version() function
build: support asan and tsan toolchain shortcuts
rmdec: Move SIPR code shared with Matroska demuxer to a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rm.h')
| -rw-r--r-- | libavformat/rm.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/rm.h b/libavformat/rm.h index b482c2fe40..a72e8b7997 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -26,7 +26,6 @@ #include "internal.h" extern const char * const ff_rm_metadata[4]; -extern const unsigned char ff_sipr_subpk_size[4]; extern const AVCodecTag ff_rm_codec_tags[]; typedef struct RMStream RMStream; @@ -93,11 +92,4 @@ int ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, int ff_rm_retrieve_cache (AVFormatContext *s, AVIOContext *pb, AVStream *st, RMStream *rst, AVPacket *pkt); -/** - * Perform 4-bit block reordering for SIPR data. - * - * @param buf SIPR data - */ -void ff_rm_reorder_sipr_data(uint8_t *buf, int sub_packet_h, int framesize); - #endif /* AVFORMAT_RM_H */ |