avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index fcdfef214757da619b3b05ca9e4c47d3d462cfc1..f9529760fc41ed01804b71f6ab30b8ceee67a002 100644 (file)
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -36,7 +36,7 @@ const uint32_t avpriv_dca_sample_rates[16] =
     12000, 24000, 48000, 96000, 192000
 };
 
-int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
+int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
                              int max_size)
 {
     uint32_t mrk;

diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index d60b28207a564f397635821b7ffd90fe7ad5c0a7..70dade5cd008826a490b1b46e7f04632fc371591 100644 (file)
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -42,7 +42,7 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16];
 /**
  * Convert bitstream to one representation based on sync marker
  */
-int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
+int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
                              int max_size);
 
 #endif /* AVCODEC_DCA_H */

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 9b73371128b841afbb5830d23639d97ca965c1dc..329b6e7bd1a0c0d9bfdebe2543d186dbd8944410 100644 (file)
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -106,7 +106,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
     if (buf_size < 12)
         return AVERROR_INVALIDDATA;
 
-    if ((ret = ff_dca_convert_bitstream(buf, 12, hdr, 12)) < 0)
+    if ((ret = avpriv_dca_convert_bitstream(buf, 12, hdr, 12)) < 0)
         return ret;
 
     init_get_bits(&gb, hdr, 96);

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c671fcd72254c0d90be75bff419b90a9d6f6feac..82d96d281ceb7ba5079ec023b50c657804b147c0 100644 (file)
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2152,7 +2152,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
 
     s->xch_present = 0;
 
-    s->dca_buffer_size = ff_dca_convert_bitstream(buf, buf_size, s->dca_buffer,
+    s->dca_buffer_size = avpriv_dca_convert_bitstream(buf, buf_size, s->dca_buffer,
                                                   DCA_MAX_FRAME_SIZE + DCA_MAX_EXSS_HEADER_SIZE);
     if (s->dca_buffer_size == AVERROR_INVALIDDATA) {
         av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0c850045a0b8a05fc773eefb3016b398a52b2ed3..97d5074faad3dfae5711b3db0d15ab0f7a14c153 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  72
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MINOR  73
+#define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \