From 5fdaf312c5541b77b6364db8b49d6abb416a25c0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 26 May 2014 09:43:50 +0200 Subject: 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. --- libavcodec/flac.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libavcodec/flac.c') 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 -- cgit v1.2.3