diff options
| -rw-r--r-- | libavcodec/dca.c | 2 | ||||
| -rw-r--r-- | libavcodec/dca.h | 2 | ||||
| -rw-r--r-- | libavcodec/dca_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/dcadec.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index fcdfef2147..f9529760fc 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 d60b28207a..70dade5cd0 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 9b73371128..329b6e7bd1 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 c671fcd722..82d96d281c 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 0c850045a0..97d5074faa 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, \ |