[vlc-commits] demux: mkv: add support for FFV1 v1 and v3

Steve Lhomme git at videolan.org
Thu Apr 13 01:03:00 CEST 2017


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Apr 12 17:14:23 2017 +0200| [1fae841bdb39e697313ae90b54df9d043a0b27a1] | committer: Jean-Baptiste Kempf

demux: mkv: add support for FFV1 v1 and v3

Fixes #18085

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mkv/matroska_segment_parse.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index f4d73613c9..a4138d1d06 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1469,6 +1469,10 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
         S_CASE("V_UNCOMPRESSED") {
             msg_Dbg( vars.p_demuxer, "uncompressed format detected");
         }
+        S_CASE("V_FFV1") {
+            vars.p_fmt->i_codec = VLC_CODEC_FFV1;
+            fill_extra_data( vars.p_tk, 0 );
+        }
         S_CASE("A_MS/ACM") {
             mkv_track_t * p_tk = vars.p_tk;
             es_format_t * p_fmt = &vars.p_tk->fmt;



More information about the vlc-commits mailing list