vlc/vlc-3.0 | branch: master | Francois Cartegnie <[email protected]> | Fri Feb 8 18:13:21 2019 +0100| [cd6dae2df55e2d2870d9caf5fc0964608c439c3b] | committer: Francois Cartegnie
mux: mp4: fix mpeg1 object id (cherry picked from commit cee51bacbc3903d75fd778f2828278d24ec75b37) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=cd6dae2df55e2d2870d9caf5fc0964608c439c3b --- modules/mux/mp4/libmp4mux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c index a4ea8b28b7..28d5cf2078 100644 --- a/modules/mux/mp4/libmp4mux.c +++ b/modules/mux/mp4/libmp4mux.c @@ -266,7 +266,7 @@ static bo_t *GetESDS(mp4mux_trackinfo_t *p_track) case VLC_CODEC_MPGV: if(p_track->fmt.i_original_fourcc == VLC_CODEC_MP1V) { - i_object_type_indication = 0x6b; + i_object_type_indication = 0x6a; /* Visual ISO/IEC 11172-2 */ break; } /* fallthrough */ @@ -275,8 +275,7 @@ static bo_t *GetESDS(mp4mux_trackinfo_t *p_track) i_object_type_indication = 0x65; break; case VLC_CODEC_MP1V: - /* MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */ - i_object_type_indication = 0x6b; + i_object_type_indication = 0x6a; /* Visual ISO/IEC 11172-2 */ break; case VLC_CODEC_MP4A: /* FIXME for mpeg2-aac == 0x66->0x68 */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
