← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to libmpdemux/demux_mkv.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmpdemux/demux_mkv.c
380
380
            }
381
381
            *size = dstlen - out_avail;
382
382
        }
 
383
      else if (track->encodings[i].comp_algo == 3)
 
384
        {
 
385
          *dest = malloc (*size + track->encodings[i].comp_settings_len);
 
386
          memcpy(*dest, track->encodings[i].comp_settings,
 
387
                 track->encodings[i].comp_settings_len);
 
388
          memcpy(*dest + track->encodings[i].comp_settings_len, src, *size);
 
389
          *size += track->encodings[i].comp_settings_len;
 
390
          modified = 1;
 
391
        }
383
392
    }
384
393
 
385
394
    return modified;
542
551
                               track->tnum);
543
552
                    }
544
553
 
545
 
                    if (e.comp_algo != 0 && e.comp_algo != 2) {
 
554
                    if (e.comp_algo != 0 && e.comp_algo != 2 && e.comp_algo != 3) {
546
555
                        mp_msg(MSGT_DEMUX, MSGL_WARN,
547
556
                               MSGTR_MPDEMUX_MKV_UnknownCompression,
548
557
                               track->tnum, e.comp_algo);