[MPlayer-cvslog] r34486 - trunk/libmpdemux/demux_mkv.c

[iive]

Author: iive
Date: Mon Jan  2 13:53:20 2012
New Revision: 34486

Log:
Add support of compression algorithm 3 (header stripping) in mkv demuxer.

Patch by Alexander Beregalov (a.beregalov gmail).

Modified:
   trunk/libmpdemux/demux_mkv.c

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Mon Jan  2 12:26:00 2012	(r34485)
+++ trunk/libmpdemux/demux_mkv.c	Mon Jan  2 13:53:20 2012	(r34486)
@@ -380,6 +380,15 @@ lzo_fail:
             }
             *size = dstlen - out_avail;
         }
+      else if (track->encodings[i].comp_algo == 3)
+        {
+          *dest = malloc (*size + track->encodings[i].comp_settings_len);
+          memcpy(*dest, track->encodings[i].comp_settings,
+                 track->encodings[i].comp_settings_len);
+          memcpy(*dest + track->encodings[i].comp_settings_len, src, *size);
+          *size += track->encodings[i].comp_settings_len;
+          modified = 1;
+        }
     }
 
     return modified;
@@ -542,7 +551,7 @@ static int demux_mkv_read_trackencodings
                                track->tnum);
                     }
 
-                    if (e.comp_algo != 0 && e.comp_algo != 2) {
+                    if (e.comp_algo != 0 && e.comp_algo != 2 && e.comp_algo != 3) {
                         mp_msg(MSGT_DEMUX, MSGL_WARN,
                                MSGTR_MPDEMUX_MKV_UnknownCompression,
                                track->tnum, e.comp_algo);