Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

[ffmpeg] / libavcodec / adx.h

diff --git a/libavcodec/adx.h b/libavcodec/adx.h
index b28d09a32eae176c9ff4a432d132d66a7b77ca07..ca59a2dccab3fb0e22fd74c33050c8a08fba60a6 100644 (file)
--- a/libavcodec/adx.h
+++ b/libavcodec/adx.h
@@ -74,7 +74,12 @@ 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);
+
+#if LIBAVCODEC_VERSION_MAJOR < 56
 int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
                              int bufsize, int *header_size, int *coeff);
+#endif
 
 #endif /* AVCODEC_ADX_H */