diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 02:29:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:32 +0100 |
| commit | 998d9ee7a446b421505978a45f947bc47d384957 (patch) | |
| tree | eafbe770d50744db5ce11c3b6b5c9fe2e8ff1f92 | |
| parent | c940ed42540649f8a0c89888d0e9352f38f0a8b3 (diff) | |
| download | ffmpeg-998d9ee7a446b421505978a45f947bc47d384957.tar.gz | |
Remove unused ff_ac3_parse_header_full function.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 676f1f533e2c2960d81784188592a066b9ff1c3d)
| -rw-r--r-- | libavcodec/ac3_parser.c | 29 | ||||
| -rw-r--r-- | libavcodec/ac3_parser.h | 11 |
2 files changed, 0 insertions, 40 deletions
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index b844ec36c3..00aa372437 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -128,35 +128,6 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) return 0; } -int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr){ - int ret, i; - ret = ff_ac3_parse_header(gbc, hdr); - if(!ret){ - if(hdr->bitstream_id>10){ - /* Enhanced AC-3 */ - skip_bits(gbc, 5); // skip bitstream id - - /* skip dialog normalization and compression gain */ - for (i = 0; i < (hdr->channel_mode ? 1 : 2); i++) { - skip_bits(gbc, 5); // skip dialog normalization - if (get_bits1(gbc)) { - skip_bits(gbc, 8); //skip Compression gain word - } - } - /* dependent stream channel map */ - if (hdr->frame_type == EAC3_FRAME_TYPE_DEPENDENT && get_bits1(gbc)) { - hdr->channel_map = get_bits(gbc, 16); //custom channel map - return 0; - } - } - //default channel map based on acmod and lfeon - hdr->channel_map = ff_eac3_default_chmap[hdr->channel_mode]; - if(hdr->lfe_on) - hdr->channel_map |= AC3_CHMAP_LFE; - } - return ret; -} - static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, int *need_next_header, int *new_frame_start) { diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h index 2f4a2eeea5..50b70b08e5 100644 --- a/libavcodec/ac3_parser.h +++ b/libavcodec/ac3_parser.h @@ -38,15 +38,4 @@ */ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); -/** - * Parse AC-3 frame header and sets channel_map - * Parse the header up to the lfeon (channel_map in E-AC-3) - * element, which is the first 52, 54 or 104 bits depending - * on the audio coding mode. - * @param[in] gbc BitContext containing the first 54 bits of the frame. - * @param[out] hdr Pointer to struct where header info is written. - * @return value returned by ff_ac3_parse_header - */ -int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr); - #endif /* AVCODEC_AC3_PARSER_H */ |