[FFmpeg-soc] [soc]: r392 - in eac3: eac3.h eac3_parser.c eac3dec.c

[bwolowiec]

Author: bwolowiec
Date: Fri Jul 13 12:34:57 2007
New Revision: 392

Log:
Added ff_ prefix



Modified:
   eac3/eac3.h
   eac3/eac3_parser.c
   eac3/eac3dec.c

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Jul 13 12:34:57 2007
@@ -361,10 +361,10 @@ typedef struct EAC3Context{
 }EAC3Context;
 
 
-int eac3_parse_syncinfo(GetBitContext *gbc, EAC3Context *s);
-int eac3_parse_bsi(GetBitContext *gbc, EAC3Context *s);
-int eac3_parse_audfrm(GetBitContext *gbc, EAC3Context *s);
-int eac3_parse_audblk(GetBitContext *gbc, EAC3Context *s, const int blk);
-int eac3_parse_auxdata(GetBitContext *gbc, EAC3Context *s);
+int ff_eac3_parse_syncinfo(GetBitContext *gbc, EAC3Context *s);
+int ff_eac3_parse_bsi(GetBitContext *gbc, EAC3Context *s);
+int ff_eac3_parse_audfrm(GetBitContext *gbc, EAC3Context *s);
+int ff_eac3_parse_audblk(GetBitContext *gbc, EAC3Context *s, const int blk);
+int ff_eac3_parse_auxdata(GetBitContext *gbc, EAC3Context *s);
 
 #endif

Modified: eac3/eac3_parser.c
==============================================================================
--- eac3/eac3_parser.c	(original)
+++ eac3/eac3_parser.c	Fri Jul 13 12:34:57 2007
@@ -34,12 +34,12 @@
 
 #include "eac3.h"
 
-int eac3_parse_syncinfo(GetBitContext *gbc, EAC3Context *s){
+int ff_eac3_parse_syncinfo(GetBitContext *gbc, EAC3Context *s){
     GET_BITS(s->syncword, gbc, 16);
     return 0;
 }
 
-int eac3_parse_bsi(GetBitContext *gbc, EAC3Context *s){
+int ff_eac3_parse_bsi(GetBitContext *gbc, EAC3Context *s){
     int i, blk;
 
     GET_BITS(s->strmtyp, gbc, 2);
@@ -254,7 +254,7 @@ int eac3_parse_bsi(GetBitContext *gbc, E
 } /* end of bsi */
 
 
-int eac3_parse_audfrm(GetBitContext *gbc, EAC3Context *s){
+int ff_eac3_parse_audfrm(GetBitContext *gbc, EAC3Context *s){
     int blk, ch;
 
     /* These fields for audio frame exist flags and strategy data */
@@ -454,7 +454,7 @@ int eac3_parse_audfrm(GetBitContext *gbc
     return 0;
 } /* end of audfrm */
 
-int eac3_parse_audblk(GetBitContext *gbc, EAC3Context *s, const int blk){
+int ff_eac3_parse_audblk(GetBitContext *gbc, EAC3Context *s, const int blk){
     //int grp, sbnd, n, bin;
     int seg, bnd, ch, i;
     int got_cplchan;
@@ -1310,7 +1310,7 @@ int eac3_parse_audblk(GetBitContext *gbc
     return 0;
 }
 
-int eac3_parse_auxdata(GetBitContext *gbc, EAC3Context *s){
+int ff_eac3_parse_auxdata(GetBitContext *gbc, EAC3Context *s){
     // TODO
     return 0;
 }

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Jul 13 12:34:57 2007
@@ -99,12 +99,12 @@ static int eac3_decode_frame(AVCodecCont
     c->csnroffst  = -1;
 
     init_get_bits(&gbc, buf, buf_size*8);
-    eac3_parse_syncinfo(&gbc, c);
+    ff_eac3_parse_syncinfo(&gbc, c);
 
     if(c->syncword != 0x0B77)
         return -1;
 
-    if(eac3_parse_bsi(&gbc, c) || eac3_parse_audfrm(&gbc, c))
+    if(ff_eac3_parse_bsi(&gbc, c) || ff_eac3_parse_audfrm(&gbc, c))
         return -1;
 
     if(c->fscod == 3){
@@ -130,7 +130,7 @@ static int eac3_decode_frame(AVCodecCont
 #ifdef DEBUG
     av_log(NULL, AV_LOG_INFO, "-------START BLK-------\n");
 #endif
-        if(eac3_parse_audblk(&gbc, c, blk)){
+        if(ff_eac3_parse_audblk(&gbc, c, blk)){
             return -1;
         }
 #ifdef DEBUG