[vlc-commits] MP4: support udta.name for track description

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 29 01:04:29 2011 +0200| [7210d75b580bfe19f0bde64328b5522677412039] | committer: Jean-Baptiste Kempf

MP4: support udta.name for track description

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

 modules/demux/mp4/mp4.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index f50c4ca..8da2542 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2403,15 +2403,19 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
     p_udta = MP4_BoxGet( p_box_trak, "udta" );
     if( p_udta )
     {
-        MP4_Box_t *p_0xa9xxx;
-        for( p_0xa9xxx = p_udta->p_first; p_0xa9xxx != NULL;
-                 p_0xa9xxx = p_0xa9xxx->p_next )
+        MP4_Box_t *p_box_iter;
+        for( p_box_iter = p_udta->p_first; p_box_iter != NULL;
+                 p_box_iter = p_box_iter->p_next )
         {
-            switch( p_0xa9xxx->i_type )
+            switch( p_box_iter->i_type )
             {
                 case ATOM_0xa9nam:
                     p_track->fmt.psz_description =
-                        strdup( p_0xa9xxx->data.p_0xa9xxx->psz_text );
+                        strdup( p_box_iter->data.p_box_iter->psz_text );
+                    break;
+                case ATOM_name:
+                    p_track->fmt.psz_description =
+                        strdup( p_box_iter->data.p_name->psz_text );
                     break;
             }
         }