• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d1c28e35
    Michael Niedermayer authored
    * qatar/master:
      build: fix standalone compilation of OMA muxer
      build: fix standalone compilation of Microsoft XMV demuxer
      build: fix standalone compilation of Core Audio Format demuxer
      kvmc: fix invalid reads
      4xm: Add a check in decode_i_frame to prevent buffer overreads
      adpcm: fix IMA SMJPEG decoding
      options: set minimum for "threads" to zero
      bsd: use number of logical CPUs as automatic thread count
      windows: use number of CPUs as automatic thread count
      linux: use number of CPUs as automatic thread count
      pthreads: reset active_thread_type when slice thread_init returrns early
      v410dec: include correct headers
      Drop ALT_ prefix from BITSTREAM_READER_LE name.
      lavfi: always build vsrc_buffer.
      ra144enc: zero the reflection coeffs if the filter is unstable
      sws: readd PAL8 to isPacked()
      mov: Don't stick the QuickTime field ordering atom in extradata.
      truespeech: fix invalid reads in truespeech_apply_twopoint_filter()
    
    Conflicts:
    	configure
    	libavcodec/4xm.c
    	libavcodec/avcodec.h
    	libavfilter/Makefile
    	libavfilter/allfilters.c
    	libavformat/Makefile
    	libswscale/swscale_internal.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d1c28e35
escape130.c 9.85 KB