• 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
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
avconv.c Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...