[FFmpeg-cvslog] r9081 - in trunk: libavcodec/mpegaudio.h libavcodec/mpegaudio_parser.c libavcodec/mpegaudiodec.c libavcodec/mpegaudiodecheader.c libavcodec/mpegaudiodecheader.h libavformat/mp3.c

[aurel]

Author: aurel
Date: Sun May 20 17:11:55 2007
New Revision: 9081

Log:
add a ff_ prefix to some mpegaudio funcs

Modified:
   trunk/libavcodec/mpegaudio.h
   trunk/libavcodec/mpegaudio_parser.c
   trunk/libavcodec/mpegaudiodec.c
   trunk/libavcodec/mpegaudiodecheader.c
   trunk/libavcodec/mpegaudiodecheader.h
   trunk/libavformat/mp3.c

Modified: trunk/libavcodec/mpegaudio.h
==============================================================================
--- trunk/libavcodec/mpegaudio.h	(original)
+++ trunk/libavcodec/mpegaudio.h	Sun May 20 17:11:55 2007
@@ -116,7 +116,7 @@ typedef struct MPADecodeContext {
 } 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,

Modified: trunk/libavcodec/mpegaudio_parser.c
==============================================================================
--- trunk/libavcodec/mpegaudio_parser.c	(original)
+++ trunk/libavcodec/mpegaudio_parser.c	Sun May 20 17:11:55 2007
@@ -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 *av
     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(AVCodecParser
                 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(AVCodecParser
 
 #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(AVCodecParser
                             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++;

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	(original)
+++ trunk/libavcodec/mpegaudiodec.c	Sun May 20 17:11:55 2007
@@ -2410,7 +2410,7 @@ retry:
         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 @@ static int decode_frame_adu(AVCodecConte
         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 @@ static int decode_frame_mp3on4(AVCodecCo
             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;

Modified: trunk/libavcodec/mpegaudiodecheader.c
==============================================================================
--- trunk/libavcodec/mpegaudiodecheader.c	(original)
+++ trunk/libavcodec/mpegaudiodecheader.c	Sun May 20 17:11:55 2007
@@ -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;

Modified: trunk/libavcodec/mpegaudiodecheader.h
==============================================================================
--- trunk/libavcodec/mpegaudiodecheader.h	(original)
+++ trunk/libavcodec/mpegaudiodecheader.h	Sun May 20 17:11:55 2007
@@ -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 */

Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c	(original)
+++ trunk/libavformat/mp3.c	Sun May 20 17:11:55 2007
@@ -264,7 +264,7 @@ static int mp3_read_probe(AVProbeData *p
 
         for(frames = 0; buf2 < end; frames++) {
             header = (buf2[0] << 24) | (buf2[1] << 16) | (buf2[2] << 8) | buf2[3];
-            fsize = mpa_decode_header(&avctx, header, &sample_rate);
+            fsize = ff_mpa_decode_header(&avctx, header, &sample_rate);
             if(fsize < 0)
                 break;
             buf2 += fsize;