[FFmpeg-cvslog] avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()
Michael Niedermayer
git at videolan.org
Wed Aug 6 22:35:27 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 6 21:29:36 2014 +0200| [7a34b7d80f35f3c6862b1dc30628658a6e60b599] | committer: Michael Niedermayer
avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a34b7d80f35f3c6862b1dc30628658a6e60b599
---
libavcodec/dca.c | 2 +-
libavcodec/dca.h | 2 +-
libavcodec/dca_parser.c | 2 +-
libavcodec/dcadec.c | 2 +-
libavcodec/version.h | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index fcdfef2..f952976 100644
--- 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 d60b282..70dade5 100644
--- 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 9b73371..329b6e7 100644
--- 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 c671fcd..82d96d2 100644
--- 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 0c85004..97d5074 100644
--- 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, \
More information about the ffmpeg-cvslog
mailing list