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

[jbr]

Author: jbr
Date: Fri Dec 14 05:50:53 2007
New Revision: 1566

Log:
rename bsid to bitstream_id

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

Modified: eac3/eac3.h
==============================================================================
--- eac3/eac3.h	(original)
+++ eac3/eac3.h	Fri Dec 14 05:50:53 2007
@@ -50,7 +50,7 @@ typedef struct EAC3Context{
     int num_blocks;                  ///< Number of audio blocks
     int channel_mode;                ///< Channel mode (acmod)
     int lfe_on;                      ///< Low frequency effect channel on
-    int bsid;                        ///< Bit stream identification
+    int bitstream_id;                ///< Bit stream identification (bsid)
     float dialnorm[2];               ///< Dialogue normalization
     int mixmdate;                    ///< Mixing meta-data exists
     int dmixmod;                     ///< Preferred stereo downmix mode

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri Dec 14 05:50:53 2007
@@ -375,9 +375,9 @@ static int parse_bsi(GetBitContext *gbc,
         s->num_channels++;
     }
 
-    s->bsid = get_bits(gbc, 5);
-    if (s->bsid < 11 || s->bsid > 16) {
-        av_log(s->avctx, AV_LOG_ERROR, "bsid is not within 11 and 16\n");
+    s->bitstream_id = get_bits(gbc, 5);
+    if (s->bitstream_id < 11 || s->bitstream_id > 16) {
+        av_log(s->avctx, AV_LOG_ERROR, "bitstream id is not within 11 and 16\n");
         return -1;
     }