[vlc-commits] demux: mp4: name field

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jun  5 20:11:42 2014 +0200| [6422c02eee9d6facde0838df297b49dc50265e92] | committer: Francois Cartegnie

demux: mp4: name field

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6422c02eee9d6facde0838df297b49dc50265e92
---

 modules/demux/mp4/libmp4.c |    4 ++--
 modules/demux/mp4/libmp4.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 3ea7d86..a1aa2fd 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -1636,7 +1636,7 @@ static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
 
     MP4_GET2BYTES( p_box->data.p_sample_soun->i_channelcount );
     MP4_GET2BYTES( p_box->data.p_sample_soun->i_samplesize );
-    MP4_GET2BYTES( p_box->data.p_sample_soun->i_predefined );
+    MP4_GET2BYTES( p_box->data.p_sample_soun->i_compressionid );
     MP4_GET2BYTES( p_box->data.p_sample_soun->i_reserved3 );
     MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratehi );
     MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratelo );
@@ -1671,7 +1671,7 @@ static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
         /* Checks */
         if ( p_box->data.p_sample_soun->i_channelcount != 0x3  ||
              p_box->data.p_sample_soun->i_samplesize != 0x0010 ||
-             p_box->data.p_sample_soun->i_predefined != 0xFFFE ||
+             p_box->data.p_sample_soun->i_compressionid != 0xFFFE ||
              p_box->data.p_sample_soun->i_reserved3 != 0x0     ||
              p_box->data.p_sample_soun->i_sampleratehi != 0x1  ||//65536
              p_box->data.p_sample_soun->i_sampleratelo != 0x0 )  //remainder
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 7b2cbfc..97fe314 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -497,7 +497,7 @@ typedef struct MP4_Box_data_sample_soun_s
 
     uint16_t i_channelcount;
     uint16_t i_samplesize;
-    uint16_t i_predefined;
+    uint16_t i_compressionid;
     uint16_t i_reserved3;
     uint16_t i_sampleratehi; /* timescale of track */
     uint16_t i_sampleratelo;