diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-10-17 00:23:32 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-10-22 00:34:54 +0200 |
| commit | 957f92729a3ea24c6f565ca33573ff12189e9a4e (patch) | |
| tree | f01da022f0be23e939233b266ccd94445b9881b9 | |
| parent | 18e8fac531cb4b7db3d6d36b222c99e3e8968cfe (diff) | |
avcodec: drop 2 suffix from avpriv_ac3_parse_header2
avpriv_ac3_parse_header was removed in commit 3dfb643.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavcodec/ac3_parser.c | 4 | ||||
| -rw-r--r-- | libavcodec/ac3_parser.h | 2 | ||||
| -rw-r--r-- | libavcodec/ac3dec.c | 2 | ||||
| -rw-r--r-- | libavformat/ac3dec.c | 2 | ||||
| -rw-r--r-- | libavformat/movenc.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 0dd98b9b8c..83dd90ff67 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -47,7 +47,7 @@ static const uint8_t center_levels[4] = { 4, 5, 6, 5 }; static const uint8_t surround_levels[4] = { 4, 6, 7, 6 }; -int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **phdr) +int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo **phdr) { int frame_size_code; AC3HeaderInfo *hdr; @@ -163,7 +163,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, GetBitContext gbc; init_get_bits(&gbc, tmp.u8+8-AC3_HEADER_SIZE, 54); - err = avpriv_ac3_parse_header2(&gbc, &phdr); + err = avpriv_ac3_parse_header(&gbc, &phdr); if(err < 0) return 0; diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h index 80bc5ef192..dc5d035e11 100644 --- a/libavcodec/ac3_parser.h +++ b/libavcodec/ac3_parser.h @@ -37,6 +37,6 @@ * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate) * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid. */ -int avpriv_ac3_parse_header2(GetBitContext *gbc, AC3HeaderInfo **hdr); +int avpriv_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo **hdr); #endif /* AVCODEC_AC3_PARSER_H */ diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 6df697e855..ad91405bcf 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -298,7 +298,7 @@ static int parse_frame_header(AC3DecodeContext *s) AC3HeaderInfo hdr, *phdr=&hdr; int err; - err = avpriv_ac3_parse_header2(&s->gbc, &phdr); + err = avpriv_ac3_parse_header(&s->gbc, &phdr); if (err) return err; diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index bef55cb658..363a32e04e 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -55,7 +55,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) init_get_bits(&gbc, buf3, 54); }else init_get_bits(&gbc, buf2, 54); - if(avpriv_ac3_parse_header2(&gbc, &phdr) < 0) + if(avpriv_ac3_parse_header(&gbc, &phdr) < 0) break; if(buf2 + phdr->frame_size > end) break; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5115585019..05198b4f90 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -341,7 +341,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) info = track->eac3_priv; init_get_bits(&gbc, pkt->data, pkt->size * 8); - if (avpriv_ac3_parse_header2(&gbc, &hdr) < 0) { + if (avpriv_ac3_parse_header(&gbc, &hdr) < 0) { /* drop the packets until we see a good one */ if (!track->entry) { av_log(mov, AV_LOG_WARNING, "Dropping invalid packet from start of the stream\n"); @@ -391,7 +391,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) while (cumul_size != pkt->size) { int i; init_get_bits(&gbc, pkt->data + cumul_size, (pkt->size - cumul_size) * 8); - if (avpriv_ac3_parse_header2(&gbc, &hdr) < 0) + if (avpriv_ac3_parse_header(&gbc, &hdr) < 0) return AVERROR_INVALIDDATA; if (hdr->frame_type != EAC3_FRAME_TYPE_DEPENDENT) return AVERROR(EINVAL); |