• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 464cef4c
    Michael Niedermayer authored
    * qatar/master:
      xwma: Validate channels and bits_per_coded_sample.
      mov: Do not read past the end of the ctts_data table.
      mov: Add missing terminator to mov_ch_layout_map_1ch.
      asf: reset side data elements on packet copy.
      wmavoice: fix stack overread.
      wmalossless: error out if a subframe is not used by any channel.
      vqa: check palette chunk size before reading data.
      wmalossless: reset sample pointer for each subframe.
      wmalossless: error out on invalid values for order.
    
    Conflicts:
    	libavcodec/vqavideo.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    464cef4c
xwma.c 9.29 KB