[vlc-commits] demux: ts: correctly upgrade ATSC AC3 streams

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec  7 16:33:07 2016 +0100| [e3aa16fa29c823ef44458d346bc3211f108b3c8b] | committer: Francois Cartegnie

demux: ts: correctly upgrade ATSC AC3 streams

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

 modules/demux/mpeg/ts_psi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index 18be27b..eaadff0 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1202,8 +1202,11 @@ static bool PMTSetupEsRegistration( demux_t *p_demux, ts_pes_es_t *p_es,
         {
             p_fmt->i_cat   = p_regs[i].i_cat;
             p_fmt->i_codec = p_regs[i].i_codec;
-            if (p_dvbpsies->i_type == 0x87)
+
+            /* System A AC3 extension, see ATSC A/52 Annex G.2 */
+            if ( p_regs[i].i_codec == VLC_CODEC_A52 && p_dvbpsies->i_type == 0x87 )
                 p_fmt->i_codec = VLC_CODEC_EAC3;
+
             return true;
         }
     }