virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec: drop 2 suffix from avpriv_ac3_parse_header2

Browse Source 
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>
This commit is contained in:
Andreas Cadhalpun 2015-10-17 00:23:32 +02:00
parent 18e8fac531
commit 957f92729a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ac3_parser.c
View File

@ -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;

2
libavcodec/ac3_parser.h
View File

@ -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 */

2
libavcodec/ac3dec.c
View File

@ -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;

2
libavformat/ac3dec.c
View File

@ -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;

4
libavformat/movenc.c
View File

@ -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);