[vlc-commits] PS: Fix H264 in evob

Jean-Baptiste Kempf git at videolan.org
Wed Oct 15 18:07:48 CEST 2014


vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Aug  8 04:42:48 2014 +0200| [c66a9f4334b6dc838451ba2d1b4f6d53fe7d1a5a] | committer: Jean-Baptiste Kempf

PS: Fix H264 in evob

(cherry picked from commit 3b33cbca98e76ed3d65fabcf9efedcea415ffdf5)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/ps.h |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index cd7d547..ab2d0db 100644
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -190,6 +190,12 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
         {
             es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA );
         }
+        else if( i_id == 0xe2 || /* Primary H.264 in evob */
+                 i_id == 0xe3 )  /* Seconday H.264 in evob */
+        {
+                es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 );
+        }
+
 
         if( tk->fmt.i_cat == UNKNOWN_ES && ( i_id&0xf0 ) == 0xe0 )
         {



More information about the vlc-commits mailing list