ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-01 18:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,323 Commits 37 Branches 400 Tags 502 MiB
4478e9d8db
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
4478e9d8db Merge remote-tracking branch 'qatar/master' 
* 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: Michael Niedermayer <michaelni@gmx.at>
 2012-01-01 00:07:31 +01:00
Oana Stratulat
febd022228 FATE: add tests for dfa 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-31 15:06:31 -05:00