From 82ab61f9015659419e0a2766ee031c367e3f2908 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 17 Oct 2011 09:28:53 +0200 Subject: lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header, ff_mpegaudio_decode_header. --- libavformat/mp3enc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/mp3enc.c') diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 07c28e176d..64f8957a4c 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -217,12 +217,12 @@ static void mp3_write_xing(AVFormatContext *s) MPADecodeHeader mpah; int srate_idx, i, channels; - for (i = 0; i < FF_ARRAY_ELEMS(ff_mpa_freq_tab); i++) - if (ff_mpa_freq_tab[i] == codec->sample_rate) { + for (i = 0; i < FF_ARRAY_ELEMS(avpriv_mpa_freq_tab); i++) + if (avpriv_mpa_freq_tab[i] == codec->sample_rate) { srate_idx = i; break; } - if (i == FF_ARRAY_ELEMS(ff_mpa_freq_tab)) { + if (i == FF_ARRAY_ELEMS(avpriv_mpa_freq_tab)) { av_log(s, AV_LOG_ERROR, "Unsupported sample rate.\n"); return; } @@ -240,7 +240,7 @@ static void mp3_write_xing(AVFormatContext *s) header |= channels << 6; avio_wb32(s->pb, header); - ff_mpegaudio_decode_header(&mpah, header); + avpriv_mpegaudio_decode_header(&mpah, header); ffio_fill(s->pb, 0, xing_offset); ffio_wfourcc(s->pb, "Xing"); -- cgit v1.2.3