[vlc-commits] demux: avi: fix non fixed sample size ADTS/AAC (fix #12727)

2014-11-11 Thread Francois Cartegnie 
vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Mon Nov 
10 21:39:39 2014 +0100| [99f76cecbd9dc16f98988d9cbd6bc6db593b2b4c] | committer: 
Jean-Baptiste Kempf

demux: avi: fix non fixed sample size ADTS/AAC (fix #12727)

(cherry picked from commit 600d5e3974ef4ee7242dbc3411dd0dfe59f029c1)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=99f76cecbd9dc16f98988d9cbd6bc6db593b2b4c
---

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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 2169c8a..3a31702 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -445,6 +445,11 @@ static int Open( vlc_object_t * p_this )
 tk->i_blocksize = 0; /* fix vorbis VBR decoding */
 }
 
+if ( tk->i_codec == VLC_CODEC_MP4A )
+{
+tk->i_samplesize = 0; /* ADTS/AAC VBR */
+}
+
 es_format_Init( &fmt, AUDIO_ES, tk->i_codec );
 
 fmt.audio.i_channels= p_auds->p_wf->nChannels;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: avi: fix non fixed sample size ADTS/AAC (fix #12727)

2014-11-10 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Mon Nov 10 
21:39:39 2014 +0100| [600d5e3974ef4ee7242dbc3411dd0dfe59f029c1] | committer: 
Francois Cartegnie

demux: avi: fix non fixed sample size ADTS/AAC (fix #12727)

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

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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index ef783d9..10ea01d 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -446,6 +446,11 @@ static int Open( vlc_object_t * p_this )
 tk->i_blocksize = 0; /* fix vorbis VBR decoding */
 }
 
+if ( tk->i_codec == VLC_CODEC_MP4A )
+{
+tk->i_samplesize = 0; /* ADTS/AAC VBR */
+}
+
 es_format_Init( &fmt, AUDIO_ES, tk->i_codec );
 
 fmt.audio.i_channels= p_auds->p_wf->nChannels;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits