• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4478e9d8
    Michael Niedermayer authored
    * qatar/master:
      FATE: add tests for dfa
      mpegaudiodec: fix seeking.
      mpegaudiodec: fix compilation when testing the unchecked bitstream reader
      threads: add sysconf based number of CPUs detection
      threads: always include necessary headers for number of CPUs detection
      threads: default to automatic thread count detection
      Changelog: restore version <next> header
      cook: K&R formatting cosmetics
    
    Conflicts:
    	Changelog
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4478e9d8
Makefile 5.07 KB