[MPlayer-cvslog] r26114 - in trunk/libmpdemux: demuxer.c stheader.h

[eugeni]

Author: eugeni
Date: Fri Feb 29 18:25:33 2008
New Revision: 26114

Log:
Add language info to sh_sub_t and sh_audio_t.


Modified:
   trunk/libmpdemux/demuxer.c
   trunk/libmpdemux/stheader.h

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Fri Feb 29 18:25:33 2008
@@ -255,6 +255,7 @@ void free_sh_sub(sh_sub_t *sh) {
 #ifdef USE_ASS
     if (sh->ass_track) ass_free_track(sh->ass_track);
 #endif
+    free(sh->lang);
     free(sh);
 }
 
@@ -289,6 +290,7 @@ void free_sh_audio(demuxer_t *demuxer, i
     mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_audio at %p\n",sh);
     if(sh->wf) free(sh->wf);
     if(sh->codecdata) free(sh->codecdata);
+    free(sh->lang);
     free(sh);
 }
 

Modified: trunk/libmpdemux/stheader.h
==============================================================================
--- trunk/libmpdemux/stheader.h	(original)
+++ trunk/libmpdemux/stheader.h	Fri Feb 29 18:25:33 2008
@@ -49,6 +49,7 @@ typedef struct {
   int codecdata_len;
   double pts;  // last known pts value in output from decoder
   int pts_bytes; // bytes output by decoder after last known pts
+  char* lang; // track language
 } sh_audio_t;
 
 typedef struct {
@@ -105,6 +106,7 @@ typedef struct {
 #ifdef USE_ASS
   ass_track_t* ass_track;  // for SSA/ASS streams (type == 'a')
 #endif
+  char* lang; // track language
 } sh_sub_t;
 
 // demuxer.c: