• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a8cedbeb
    Michael Niedermayer authored
    * qatar/master:
      ttadec: unbreak playback of matroska files
      vorbisdec: avoid invalid memory access
      Fix uninitialized reads on malformed ogg files.
      huffyuv: add padding to classic (v1) huffman tables.
      png: convert to bytestream2 API.
      dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
      avs: fix infinite loop on end-of-stream.
      tiffdec: Prevent illegal memory access caused by recycled pointers.
      rtpenc: Fix the AVRational used for av_rescale_q_rnd
      wma: fix off-by-one in array bounds check.
    
    Conflicts:
    	libavcodec/huffyuv.c
    	libavcodec/pngdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a8cedbeb
tta.c 14.9 KB