• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9b471735
    Michael Niedermayer authored
    * qatar/master: (24 commits)
      mpegps: Use av_get_packet() instead of poorly emulating it.
      motionpixels: decode only the 111 complete frames for fate
      mpc8: Check out of bound bands limit
      xan: Prevent NULL dereference with missing palette
      xan: Check for out of bound reads in xan_huffman_decode()
      xan: Fixed out of bound accesses in xan_unpack()
      motionpixels: Prevent calling init_vlc() with invalid parameters
      shorten: Fix out of bound writes in fix_bitshift()
      dsicinav: Check for out of bounds writes
      tiertexseqv: Check for out of bound reads
      quickdraw: Check for out of bound reads
      dsicinav: Check for out of bounds reads
      motionpixels: Fix the size of workspace buffers
      motionpixels: Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer
      wmavoice: Check for corrupted extra data
      wmavoice: Check for out of bound writes
      xan: Prevent NULL dereferences with missing reference frame
      bink: Prevent NULL dereferences with missing reference frame
      wavpack: Reset internal state on corrupted blocks
      wmapro: Validate the number of audio channels before using it
      ...
    
    Conflicts:
    	libavcodec/h264.c
    	libavcodec/xan.c
    	tests/ref/fate/motionpixels
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9b471735
h264.c 161 KB