avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for...
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 19:29:36 +0000 (21:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Aug 2014 20:28:35 +0000 (22:28 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dca.c
libavcodec/dca.h
libavcodec/dca_parser.c
libavcodec/dcadec.c
libavcodec/version.h

index fcdfef2..f952976 100644 (file)
@@ -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;
index d60b282..70dade5 100644 (file)
@@ -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 */
index 9b73371..329b6e7 100644 (file)
@@ -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);
index c671fcd..82d96d2 100644 (file)
@@ -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");
index 0c85004..97d5074 100644 (file)
@@ -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, \