diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 23:24:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:07:31 +0100 |
| commit | 4478e9d8db65ca827f2b3ef3ef6ee806bffdba45 (patch) | |
| tree | 795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1 /Changelog | |
| parent | 2cba62bd84d15e84633b982f868fb1e50834c0d8 (diff) | |
| parent | febd022228660cb4b4d0e7b108bfec339b7dce92 (diff) | |
| download | ffmpeg-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 'Changelog')
| -rw-r--r-- | Changelog | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -6,7 +6,6 @@ version next: - v410 Quicktime Uncompressed 4:4:4 10-bit encoder and decoder - SBaGen (SBG) binaural beats script demuxer - OpenMG Audio muxer -- SMJPEG demuxer - dv: add timecode to metadata - thumbnail video filter - XML output in ffprobe @@ -14,6 +13,9 @@ version next: - tinterlace video filter - astreamsync audio filter - amerge audio filter +- Indeo 4 decoder +- SMJPEG demuxer +- Automatic thread count based on detection number of (available) CPU cores version 0.9: @@ -150,8 +152,6 @@ easier to use. The changes are: - Dxtory capture format decoder - cellauto source - Simple segmenting muxer -- Indeo 4 decoder -- SMJPEG demuxer version 0.8: |