vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Nov 21 18:28:48 2019 +0900| [58559e7460423c09b9f07d753829926d92345a28] | committer: Francois Cartegnie
demux: adaptive: use avc1 for H264 avoids trashing es in recycling, translation being done later in core esOutAdd handler > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=58559e7460423c09b9f07d753829926d92345a28 --- modules/demux/adaptive/tools/FormatNamespace.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/demux/adaptive/tools/FormatNamespace.cpp b/modules/demux/adaptive/tools/FormatNamespace.cpp index c07fd06ad5..4b7b52fd69 100644 --- a/modules/demux/adaptive/tools/FormatNamespace.cpp +++ b/modules/demux/adaptive/tools/FormatNamespace.cpp @@ -108,7 +108,7 @@ void FormatNamespace::Parse(vlc_fourcc_t fcc, const std::vector<std::string> &el case MP4RA("svc1"): case MP4RA("mvc1"): case MP4RA("mvc2"): - es_format_Change(&fmt, VIDEO_ES, VLC_CODEC_H264); + es_format_Change(&fmt, VIDEO_ES, VLC_FOURCC('a','v','c','1')); if(elements.size() > 0 && elements.at(0).size() == 6) { const std::string &sixbytes = elements.at(0); @@ -146,8 +146,7 @@ void FormatNamespace::Parse(vlc_fourcc_t fcc, const std::vector<std::string> &el case MSFCC("AVC1"): case MSFCC("AVCB"): case MSFCC("H264"): - es_format_Change(&fmt, VIDEO_ES, VLC_CODEC_H264); - fmt.i_original_fourcc = VLC_FOURCC( 'a', 'v', 'c', '1' ); + es_format_Change(&fmt, VIDEO_ES, VLC_FOURCC('a','v','c','1')); break; case MSFCC("WVC1"): es_format_Change(&fmt, VIDEO_ES, VLC_CODEC_VC1); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
