Skip to content

V
vlc-2-2
Commit 3d96a1ab authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

MP4: support for more codecs in mp4 

According to http://www.mp4ra.org/object.html (not tested)
parent f6dd8d2f
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 1 deletion
modules/demux/mp4/mp4.c
View file @ 3d96a1ab
...@@ -1852,6 +1852,9 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1852,6 +1852,9 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
case( 0x20 ): /* MPEG4 VIDEO */ case( 0x20 ): /* MPEG4 VIDEO */
p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','v' ); p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','v' );
break; break;
case( 0x21 ): /* H.264 */
p_track->fmt.i_codec = VLC_CODEC_H264;
break;
case( 0x40): case( 0x40):
p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' ); p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' );
if( p_decconfig->i_decoder_specific_info_len >= 2 && if( p_decconfig->i_decoder_specific_info_len >= 2 &&
...@@ -1891,12 +1894,21 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1891,12 +1894,21 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
case( 0x6d ): /* png */ case( 0x6d ): /* png */
p_track->fmt.i_codec = VLC_FOURCC( 'p','n','g',' ' ); p_track->fmt.i_codec = VLC_FOURCC( 'p','n','g',' ' );
break; break;
case( 0x6e ): /* jpeg200 */ case( 0x6e ): /* jpeg2000 */
p_track->fmt.i_codec = VLC_FOURCC( 'M','J','2','C' ); p_track->fmt.i_codec = VLC_FOURCC( 'M','J','2','C' );
break; break;
case( 0xa3 ): /* vc1 */ case( 0xa3 ): /* vc1 */
p_track->fmt.i_codec = VLC_FOURCC( 'W','V','C','1' ); p_track->fmt.i_codec = VLC_FOURCC( 'W','V','C','1' );
break; break;
case( 0xa4 ):
p_track->fmt.i_codec = VLC_CODEC_DIRAC;
break;
case( 0xa5 ):
p_track->fmt.i_codec = VLC_CODEC_A52;
break;
case( 0xa6 ):
p_track->fmt.i_codec = VLC_CODEC_EAC3;
break;
case( 0xa9 ): /* dts */ case( 0xa9 ): /* dts */
case( 0xaa ): /* DTS-HD HRA */ case( 0xaa ): /* DTS-HD HRA */
case( 0xab ): /* DTS-HD Master Audio */ case( 0xab ): /* DTS-HD Master Audio */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment