virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity

add a ff_ prefix to some mpegaudio funcs

Browse Source 
Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2007-05-20 15:11:55 +00:00
parent 4bd8e17c8d
commit ca6e50afc1
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mpegaudio_parser.c
View File

@@ -44,7 +44,7 @@ typedef struct MpegAudioParseContext {
/* 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 @@ int mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate)
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 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
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 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
#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 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
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++;