virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-06 21:29:36 +02:00
parent 40a820d6d8
commit 7a34b7d80f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dca.c
View File

@@ -36,7 +36,7 @@ const uint32_t avpriv_dca_sample_rates[16] =
12000, 24000, 48000, 96000, 192000 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) int max_size)
{ {
uint32_t mrk; uint32_t mrk;

2
libavcodec/dca.h
View 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 * 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); int max_size);
#endif /* AVCODEC_DCA_H */ #endif /* AVCODEC_DCA_H */

2
libavcodec/dca_parser.c
View File

@@ -106,7 +106,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
if (buf_size < 12) if (buf_size < 12)
return AVERROR_INVALIDDATA; 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; return ret;
init_get_bits(&gb, hdr, 96); init_get_bits(&gb, hdr, 96);

2
libavcodec/dcadec.c
View File

@@ -2152,7 +2152,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
s->xch_present = 0; 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); DCA_MAX_FRAME_SIZE + DCA_MAX_EXSS_HEADER_SIZE);
if (s->dca_buffer_size == AVERROR_INVALIDDATA) { if (s->dca_buffer_size == AVERROR_INVALIDDATA) {
av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n"); av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");

4
libavcodec/version.h
View File

@@ -29,8 +29,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 72 #define LIBAVCODEC_VERSION_MINOR 73
#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \