summaryrefslogtreecommitdiff
path: root/libavcodec/flacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-06 13:54:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-06 13:54:11 +0100
commitcfef947f7f1f2520098e4e2763cf5ec2f7cc21c7 (patch)
treebaec1bd8e97531a4a5b3c342c24e594367bac45c /libavcodec/flacdec.c
parentb6a99563962c27380e14c6f725cc8f6ae9ee5d22 (diff)
parentc070a8751597e3aa1b443e88464da785d8966b14 (diff)
downloadffmpeg-cfef947f7f1f2520098e4e2763cf5ec2f7cc21c7.tar.gz
Merge commit 'c070a8751597e3aa1b443e88464da785d8966b14'
* commit 'c070a8751597e3aa1b443e88464da785d8966b14': lavc: make avpriv_flac_parse_streaminfo() private on the next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdec.c')
-rw-r--r--libavcodec/flacdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 1333972d66..920bb3da93 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -106,7 +106,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
/* initialize based on the demuxer-supplied streamdata header */
- avpriv_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo);
+ ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo);
ret = allocate_buffers(s);
if (ret < 0)
return ret;
@@ -168,7 +168,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size)
metadata_size != FLAC_STREAMINFO_SIZE) {
return AVERROR_INVALIDDATA;
}
- avpriv_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, &buf[8]);
+ ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, &buf[8]);
ret = allocate_buffers(s);
if (ret < 0)
return ret;