Browse code

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

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

Michael Niedermayer authored on 2014/08/07 04:29:36
Showing 5 changed files
... ...
@@ -36,7 +36,7 @@ const uint32_t avpriv_dca_sample_rates[16] =
36 36
     12000, 24000, 48000, 96000, 192000
37 37
 };
38 38
 
39
-int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
39
+int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
40 40
                              int max_size)
41 41
 {
42 42
     uint32_t mrk;
... ...
@@ -42,7 +42,7 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16];
42 42
 /**
43 43
  * Convert bitstream to one representation based on sync marker
44 44
  */
45
-int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
45
+int avpriv_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst,
46 46
                              int max_size);
47 47
 
48 48
 #endif /* AVCODEC_DCA_H */
... ...
@@ -106,7 +106,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
106 106
     if (buf_size < 12)
107 107
         return AVERROR_INVALIDDATA;
108 108
 
109
-    if ((ret = ff_dca_convert_bitstream(buf, 12, hdr, 12)) < 0)
109
+    if ((ret = avpriv_dca_convert_bitstream(buf, 12, hdr, 12)) < 0)
110 110
         return ret;
111 111
 
112 112
     init_get_bits(&gb, hdr, 96);
... ...
@@ -2152,7 +2152,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
2152 2152
 
2153 2153
     s->xch_present = 0;
2154 2154
 
2155
-    s->dca_buffer_size = ff_dca_convert_bitstream(buf, buf_size, s->dca_buffer,
2155
+    s->dca_buffer_size = avpriv_dca_convert_bitstream(buf, buf_size, s->dca_buffer,
2156 2156
                                                   DCA_MAX_FRAME_SIZE + DCA_MAX_EXSS_HEADER_SIZE);
2157 2157
     if (s->dca_buffer_size == AVERROR_INVALIDDATA) {
2158 2158
         av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");
... ...
@@ -29,8 +29,8 @@
29 29
 #include "libavutil/version.h"
30 30
 
31 31
 #define LIBAVCODEC_VERSION_MAJOR 55
32
-#define LIBAVCODEC_VERSION_MINOR  72
33
-#define LIBAVCODEC_VERSION_MICRO 102
32
+#define LIBAVCODEC_VERSION_MINOR  73
33
+#define LIBAVCODEC_VERSION_MICRO 100
34 34
 
35 35
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
36 36
                                                LIBAVCODEC_VERSION_MINOR, \