[vlc-commits] Revert "Revert "Correctly detect alac in mp4 properties""

Jean-Baptiste Kempf git at videolan.org
Wed Dec 5 11:46:27 CET 2012


vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Dec  4 18:16:55 2012 +0100| [f1276774758c23ba9be8c04731db73482c61e1d0] | committer: Jean-Baptiste Kempf

Revert "Revert "Correctly detect alac in mp4 properties""

This reverts commit e884176085b697fdf2cbe92a63021ad79d5976ad.

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

 modules/demux/mp4/mp4.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index ff590c3..488b371d 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -2032,6 +2032,11 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
                             p_sample->data.p_sample_soun->p_qt_description,
                             p_track->fmt.i_extra);
                 }
+                if( p_track->fmt.i_extra >= 56 && p_sample->i_type == VLC_CODEC_ALAC )
+                {
+                    p_track->fmt.audio.i_channels = *((uint8_t*)p_track->fmt.p_extra + 41);
+                    p_track->fmt.audio.i_rate = GetDWBE((uint8_t*)p_track->fmt.p_extra + 52);
+                }
                 break;
 
             case VLC_FOURCC( 'v', 'c', '-', '1' ):



More information about the vlc-commits mailing list