lavc: use avpriv_ prefix for ff_aac_parse_header().

It's used in lavf.

Anton Khirnov committed 15 years ago

Commit 73ae27e1 parent 8d74bf17 files · +7 −7Browse files

Unified · Split

7 files

libavcodec/aac_adtstoasc_bsf.c +1 −1
libavcodec/aac_parser.c +1 −1
libavcodec/aacadtsdec.c +1 −1
libavcodec/aacadtsdec.h +1 −1
libavcodec/aacdec.c +1 −1
libavformat/spdifdec.c +1 −1
libavformat/spdifenc.c +1 −1

libavcodec/aac_adtstoasc_bsf.c+1−1

@@ -55,7 +55,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc, · 54 unmodified lines
55	if (show_bits(&gb, 12) != 0xfff)	55	if (show_bits(&gb, 12) != 0xfff)
56	return 0;	56	return 0;
57		57
58	if (ff_aac_parse_header(&gb, &hdr) < 0) {	58	if (avpriv_aac_parse_header(&gb, &hdr) < 0) {
59	av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");	59	av_log(avctx, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");
60	return -1;	60	return -1;
61	}	61	}

libavcodec/aac_parser.c+1−1

@@ -40,7 +40,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, · 39 unmodified lines
40	tmp.u64 = av_be2ne64(state);	40	tmp.u64 = av_be2ne64(state);
41	init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8);	41	init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8);
42		42
43	if ((size = ff_aac_parse_header(&bits, &hdr)) < 0)	43	if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0)
44	return 0;	44	return 0;
45	*need_next_header = 0;	45	*need_next_header = 0;
46	*new_frame_start = 1;	46	*new_frame_start = 1;

libavcodec/aacadtsdec.c+1−1

@@ -26,7 +26,7 @@ · 25 unmodified lines
26	#include "get_bits.h"	26	#include "get_bits.h"
27	#include "mpeg4audio.h"	27	#include "mpeg4audio.h"
28		28
29	int ff_aac_parse_header(GetBitContext gbc, AACADTSHeaderInfo hdr)	29	int avpriv_aac_parse_header(GetBitContext gbc, AACADTSHeaderInfo hdr)
30	{	30	{
31	int size, rdb, ch, sr;	31	int size, rdb, ch, sr;
32	int aot, crc_abs;	32	int aot, crc_abs;

libavcodec/aacadtsdec.h+1−1

@@ -49,6 +49,6 @@ typedef struct { · 48 unmodified lines
49	* -2 if the version element is invalid, -3 if the sample rate	49	* -2 if the version element is invalid, -3 if the sample rate
50	* element is invalid, or -4 if the bit rate element is invalid.	50	* element is invalid, or -4 if the bit rate element is invalid.
51	*/	51	*/
52	int ff_aac_parse_header(GetBitContext gbc, AACADTSHeaderInfo hdr);	52	int avpriv_aac_parse_header(GetBitContext gbc, AACADTSHeaderInfo hdr);
53		53
54	#endif /* AVCODEC_AACADTSDEC_H */	54	#endif /* AVCODEC_AACADTSDEC_H */

libavcodec/aacdec.c+1−1

@@ -2075,7 +2075,7 @@ static int parse_adts_frame_header(AACContext ac, GetBitContext gb) · 2074 unmodified lines
2075	int size;	2075	int size;
2076	AACADTSHeaderInfo hdr_info;	2076	AACADTSHeaderInfo hdr_info;
2077		2077
2078	size = ff_aac_parse_header(gb, &hdr_info);	2078	size = avpriv_aac_parse_header(gb, &hdr_info);
2079	if (size > 0) {	2079	if (size > 0) {
2080	if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) {	2080	if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) {
2081	enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];	2081	enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];

libavformat/spdifdec.c+1−1

@@ -57,7 +57,7 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, · 56 unmodified lines
57	break;	57	break;
58	case IEC61937_MPEG2_AAC:	58	case IEC61937_MPEG2_AAC:
59	init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8);	59	init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8);
60	if (ff_aac_parse_header(&gbc, &aac_hdr)) {	60	if (avpriv_aac_parse_header(&gbc, &aac_hdr)) {
61	if (s) /* be silent during a probe */	61	if (s) /* be silent during a probe */
62	av_log(s, AV_LOG_ERROR, "Invalid AAC packet in IEC 61937\n");	62	av_log(s, AV_LOG_ERROR, "Invalid AAC packet in IEC 61937\n");
63	return AVERROR_INVALIDDATA;	63	return AVERROR_INVALIDDATA;

libavformat/spdifenc.c+1−1

@@ -349,7 +349,7 @@ static int spdif_header_aac(AVFormatContext s, AVPacket pkt) · 348 unmodified lines
349	int ret;	349	int ret;
350		350
351	init_get_bits(&gbc, pkt->data, AAC_ADTS_HEADER_SIZE * 8);	351	init_get_bits(&gbc, pkt->data, AAC_ADTS_HEADER_SIZE * 8);
352	ret = ff_aac_parse_header(&gbc, &hdr);	352	ret = avpriv_aac_parse_header(&gbc, &hdr);
353	if (ret < 0) {	353	if (ret < 0) {
354	av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n");	354	av_log(s, AV_LOG_ERROR, "Wrong AAC file format\n");
355	return AVERROR_INVALIDDATA;	355	return AVERROR_INVALIDDATA;