diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 14:33:07 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 14:33:49 +0400 |
| commit | 40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed (patch) | |
| tree | ca643d04291fcbfc5e857007a86a03463462f836 /libavcodec/flac.c | |
| parent | 61301ca7860fb044995c71a0cd432cb3d833eb3b (diff) | |
| parent | 5fdaf312c5541b77b6364db8b49d6abb416a25c0 (diff) | |
Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
flac: make avpriv_flac_parse_block_header() inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 c44049b352..aeb276bcdc 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -236,14 +236,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 |