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/flac.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/flac.c')
| -rw-r--r-- | libavcodec/flac.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c index e6a8ab8370..cd1a6ab87d 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -237,14 +237,10 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * skip_bits_long(&gb, 64); /* md5 sum */ } +#if LIBAVCODEC_VERSION_MAJOR < 56 void avpriv_flac_parse_block_header(const uint8_t *block_header, int *last, int *type, int *size) { - int tmp = bytestream_get_byte(&block_header); - if (last) - *last = tmp & 0x80; - if (type) - *type = tmp & 0x7F; - if (size) - *size = bytestream_get_be24(&block_header); + flac_parse_block_header(block_header, last, type, size); } +#endif |