aboutsummaryrefslogtreecommitdiffstats
path: root/ffprobe.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-31 23:24:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-01 00:07:31 +0100
commit4478e9d8db65ca827f2b3ef3ef6ee806bffdba45 (patch)
tree795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1 /ffprobe.c
parent2cba62bd84d15e84633b982f868fb1e50834c0d8 (diff)
parentfebd022228660cb4b4d0e7b108bfec339b7dce92 (diff)
downloadffmpeg-4478e9d8db65ca827f2b3ef3ef6ee806bffdba45.tar.gz
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>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions