• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 41f55277
    Michael Niedermayer authored
    * qatar/master: (34 commits)
      h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
      error_resilience: fix the check for missing references in ff_er_frame_end() for H264
      4xm: prevent NULL dereference with invalid huffman table
      4xmdemux: prevent use of uninitialized memory
      4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
      ptx: check for out of bound reads
      tiffdec: fix out of bound reads/writes
      eacmv: check for out of bound reads
      eacmv: fix potential pointer arithmetic overflows
      adpcm: fix out of bound reads due to integer overflow
      anm: prevent infinite loop
      avsdemux: check for out of bound writes
      avs: check for out of bound reads
      avsdemux: check for corrupted data
      AVOptions: refactor set_number/write_number
      AVOptions: cosmetics, rename static av_set_number2() to write_number().
      AVOptions: cosmetics, move and rename static av_set_number().
      AVOptions: split av_set_string3 into opt type-specific functions
      avidec: fix signed overflow in avi_sync()
      mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
      ...
    
    Conflicts:
    	Changelog
    	configure
    	libavcodec/ptx.c
    	libavcodec/ra144.c
    	libavcodec/vaapi_vc1.c
    	libavcodec/vc1.c
    	libavcodec/version.h
    	libavformat/4xm.c
    	libavformat/avidec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    41f55277
ptx.c 3.55 KB