[libav-devel] [PATCH] adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()

[Justin Ruggles]

It is used by the ADX decoder, and therefore needs to be exported in order to
work with shared libs.
---
 libavcodec/adx.c        |    4 ++--
 libavcodec/adx.h        |    4 ++--
 libavcodec/adx_parser.c |    4 ++--
 libavcodec/adxdec.c     |    5 +++--
 libavformat/adxdec.c    |    5 +++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libavcodec/adx.c b/libavcodec/adx.c
index 9f03e93..aa90fd8 100644
--- a/libavcodec/adx.c
+++ b/libavcodec/adx.c
@@ -34,8 +34,8 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int 
bits, int *coeff)
     coeff[1] = lrintf(-(c * c) * (1 << bits));
 }
 
-int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, int 
bufsize,
-                         int *header_size, int *coeff)
+int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
+                             int bufsize, int *header_size, int *coeff)
 {
     int offset, cutoff;
 
diff --git a/libavcodec/adx.h b/libavcodec/adx.h
index 93d547d..da40eec 100644
--- a/libavcodec/adx.h
+++ b/libavcodec/adx.h
@@ -74,7 +74,7 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int 
bits, int *coeff);
  * @param[out] coeff        2 LPC coefficients, can be NULL
  * @return data offset or negative error code if header is invalid
  */
-int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, int 
bufsize,
-                         int *header_size, int *coeff);
+int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
+                             int bufsize, int *header_size, int *coeff);
 
 #endif /* AVCODEC_ADX_H */
diff --git a/libavcodec/adx_parser.c b/libavcodec/adx_parser.c
index 6de5ad4..ebcb137 100644
--- a/libavcodec/adx_parser.c
+++ b/libavcodec/adx_parser.c
@@ -53,8 +53,8 @@ static int adx_parse(AVCodecParserContext *s1,
         ff_combine_frame(pc, END_NOT_FOUND, &buf, &buf_size);
 
         if (!s->header_size && pc->index >= MIN_HEADER_SIZE) {
-            if (ret = ff_adx_decode_header(avctx, pc->buffer, pc->index,
-                                           &s->header_size, NULL))
+            if (ret = avpriv_adx_decode_header(avctx, pc->buffer, pc->index,
+                                               &s->header_size, NULL))
                 return AVERROR_INVALIDDATA;
             s->block_size = BLOCK_SIZE * avctx->channels;
         }
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index ca96a90..4558060 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -41,8 +41,9 @@ static av_cold int adx_decode_init(AVCodecContext *avctx)
     if (avctx->extradata_size < 24)
         return AVERROR_INVALIDDATA;
 
-    if ((ret = ff_adx_decode_header(avctx, avctx->extradata, 
avctx->extradata_size,
-                                    &header_size, c->coeff)) < 0) {
+    if ((ret = avpriv_adx_decode_header(avctx, avctx->extradata,
+                                        avctx->extradata_size, &header_size,
+                                        c->coeff)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n");
         return AVERROR_INVALIDDATA;
     }
diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index 76b3728..eff2698 100644
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -86,8 +86,9 @@ static int adx_read_header(AVFormatContext *s, 
AVFormatParameters *ap)
     }
     avctx->extradata_size = c->header_size;
 
-    ret = ff_adx_decode_header(avctx, avctx->extradata, avctx->extradata_size,
-                               &c->header_size, NULL);
+    ret = avpriv_adx_decode_header(avctx, avctx->extradata,
+                                   avctx->extradata_size, &c->header_size,
+                                   NULL);
     if (ret)
         return ret;
 
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel