diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:33:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:33:49 +0200 |
| commit | 40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed (patch) | |
| tree | ca643d04291fcbfc5e857007a86a03463462f836 /libavcodec/flacdec.c | |
| parent | 61301ca7860fb044995c71a0cd432cb3d833eb3b (diff) | |
| parent | 5fdaf312c5541b77b6364db8b49d6abb416a25c0 (diff) | |
| download | ffmpeg-40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed.tar.gz | |
Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
flac: make avpriv_flac_parse_block_header() inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ec3cbffbf4..b8d45b8e1b 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -162,7 +162,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; @@ -193,7 +193,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 */ |