Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-28 14:33:07 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 14:33:49 +0400
commit40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed (patch)
treeca643d04291fcbfc5e857007a86a03463462f836 /libavformat/flacdec.c
parent61301ca7860fb044995c71a0cd432cb3d833eb3b (diff)
parent5fdaf312c5541b77b6364db8b49d6abb416a25c0 (diff)
Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0': flac: make avpriv_flac_parse_block_header() inline Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flacdec.c')
-rw-r--r--libavformat/flacdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index d17c3e6c19..880ad35049 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -51,7 +51,7 @@ static int flac_read_header(AVFormatContext *s)
/* process metadata blocks */
while (!url_feof(s->pb) && !metadata_last) {
avio_read(s->pb, header, 4);
- avpriv_flac_parse_block_header(header, &metadata_last, &metadata_type,
+ flac_parse_block_header(header, &metadata_last, &metadata_type,
&metadata_size);
switch (metadata_type) {
/* allocate and read metadata block for supported types */