Mercurial > libavcodec.hg
changeset 5051:b908c67063c8 libavcodec
add a ff_ prefix to some mpegaudio funcs
| author | aurel |
|---|---|
| date | Sun, 20 May 2007 15:11:55 +0000 |
| parents | a5f6fbc9fa66 |
| children | d981eb275c8f |
| files | mpegaudio.h mpegaudio_parser.c mpegaudiodec.c mpegaudiodecheader.c mpegaudiodecheader.h |
| diffstat | 5 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudio.h Sun May 20 13:40:07 2007 +0000 +++ b/mpegaudio.h Sun May 20 15:11:55 2007 +0000 @@ -116,7 +116,7 @@ } MPADecodeContext; int l2_select_table(int bitrate, int nb_channels, int freq, int lsf); -int mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate); +int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate); void ff_mpa_synth_init(MPA_INT *window); void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, MPA_INT *window, int *dither_state,
--- a/mpegaudio_parser.c Sun May 20 13:40:07 2007 +0000 +++ b/mpegaudio_parser.c Sun May 20 15:11:55 2007 +0000 @@ -44,7 +44,7 @@ /* useful helper to get mpeg audio stream infos. Return -1 if error in header, otherwise the coded frame size in bytes */ -int mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate) +int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate) { MPADecodeContext s1, *s = &s1; s1.avctx = avctx; @@ -52,7 +52,7 @@ if (ff_mpa_check_header(head) != 0) return -1; - if (decode_header(s, head) != 0) { + if (ff_mpegaudio_decode_header(s, head) != 0) { return -1; } @@ -127,7 +127,7 @@ header = (s->inbuf[0] << 24) | (s->inbuf[1] << 16) | (s->inbuf[2] << 8) | s->inbuf[3]; - ret = mpa_decode_header(avctx, header, &sr); + ret = ff_mpa_decode_header(avctx, header, &sr); if (ret < 0) { s->header_count= -2; /* no sync found : move by one byte (inefficient, but simple!) */ @@ -146,7 +146,7 @@ #if 0 /* free format: prepare to compute frame size */ - if (decode_header(s, header) == 1) { + if (ff_mpegaudio_decode_header(s, header) == 1) { s->frame_size = -1; } #endif @@ -199,7 +199,7 @@ s->free_format_frame_size -= padding; dprintf(avctx, "free frame size=%d padding=%d\n", s->free_format_frame_size, padding); - decode_header(s, header1); + ff_mpegaudio_decode_header(s, header1); goto next_data; } p++;
--- a/mpegaudiodec.c Sun May 20 13:40:07 2007 +0000 +++ b/mpegaudiodec.c Sun May 20 15:11:55 2007 +0000 @@ -2410,7 +2410,7 @@ goto retry; } - if (decode_header(s, header) == 1) { + if (ff_mpegaudio_decode_header(s, header) == 1) { /* free format: prepare to compute frame size */ s->frame_size = -1; return -1; @@ -2487,7 +2487,7 @@ return buf_size; } - decode_header(s, header); + ff_mpegaudio_decode_header(s, header); /* update codec info */ avctx->sample_rate = s->sample_rate; avctx->channels = s->nb_channels; @@ -2632,7 +2632,7 @@ return buf_size; } - decode_header(m, header); + ff_mpegaudio_decode_header(m, header); mp_decode_frame(m, decoded_buf, start, fsize); n = MPA_FRAME_SIZE * m->nb_channels;
--- a/mpegaudiodecheader.c Sun May 20 13:40:07 2007 +0000 +++ b/mpegaudiodecheader.c Sun May 20 15:11:55 2007 +0000 @@ -30,7 +30,7 @@ #include "mpegaudiodata.h" -int decode_header(MPADecodeContext *s, uint32_t header) +int ff_mpegaudio_decode_header(MPADecodeContext *s, uint32_t header) { int sample_rate, frame_size, mpeg25, padding; int sample_rate_index, bitrate_index;
--- a/mpegaudiodecheader.h Sun May 20 13:40:07 2007 +0000 +++ b/mpegaudiodecheader.h Sun May 20 15:11:55 2007 +0000 @@ -34,6 +34,6 @@ /* header decoding. MUST check the header before because no consistency check is done there. Return 1 if free format found and that the frame size must be computed externally */ -int decode_header(MPADecodeContext *s, uint32_t header); +int ff_mpegaudio_decode_header(MPADecodeContext *s, uint32_t header); #endif /* MPEGAUDIODECHEADER_H */