diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-05-26 09:43:50 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-05-28 07:48:30 +0200 |
| commit | 5fdaf312c5541b77b6364db8b49d6abb416a25c0 (patch) | |
| tree | baabc560f234cce310001a1348f80645de8ddb0e /libavcodec/flacdec.c | |
| parent | 54ed488b1af583df6c9d2a73b4a44f16b7e4f82c (diff) | |
| download | ffmpeg-5fdaf312c5541b77b6364db8b49d6abb416a25c0.tar.gz | |
flac: make avpriv_flac_parse_block_header() inline
This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 0305d50e30..9ca55cc1de 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -156,7 +156,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size) /* need more data */ return 0; } - avpriv_flac_parse_block_header(&buf[4], NULL, &metadata_type, &metadata_size); + flac_parse_block_header(&buf[4], NULL, &metadata_type, &metadata_size); if (metadata_type != FLAC_METADATA_TYPE_STREAMINFO || metadata_size != FLAC_STREAMINFO_SIZE) { return AVERROR_INVALIDDATA; @@ -187,7 +187,7 @@ static int get_metadata_size(const uint8_t *buf, int buf_size) do { if (buf_end - buf < 4) return 0; - avpriv_flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size); + flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size); buf += 4; if (buf_end - buf < metadata_size) { /* need more data in order to read the complete header */ |