mirror of https://git.ffmpeg.org/ffmpeg.git
800ea20cad
* qatar/master: movenc: Make tkhd "enabled" flag QuickTime compatible Conflicts: libavformat/movenc.c tests/ref/acodec/alac tests/ref/acodec/pcm-s16be tests/ref/acodec/pcm-s24be tests/ref/acodec/pcm-s32be tests/ref/acodec/pcm-s8 tests/ref/lavf/mov tests/ref/vsynth/vsynth1-dnxhd-1080i tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth1-prores tests/ref/vsynth/vsynth1-qtrle tests/ref/vsynth/vsynth1-svq1 tests/ref/vsynth/vsynth2-dnxhd-1080i tests/ref/vsynth/vsynth2-mpeg4 tests/ref/vsynth/vsynth2-prores tests/ref/vsynth/vsynth2-qtrle tests/ref/vsynth/vsynth2-svq1 Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| adpcm-adx | ||
| adpcm-ima_qt | ||
| adpcm-ima_wav | ||
| adpcm-ms | ||
| adpcm-swf | ||
| adpcm-yamaha | ||
| adpcm_ima_qt | ||
| alac | ||
| flac | ||
| g723_1 | ||
| mp2 | ||
| pcm-alaw | ||
| pcm-f32be | ||
| pcm-f32le | ||
| pcm-f64be | ||
| pcm-f64le | ||
| pcm-mulaw | ||
| pcm-s8 | ||
| pcm-s8_planar | ||
| pcm-s16be | ||
| pcm-s16be_planar | ||
| pcm-s16le | ||
| pcm-s16le_planar | ||
| pcm-s24be | ||
| pcm-s24le | ||
| pcm-s24le_planar | ||
| pcm-s32be | ||
| pcm-s32le | ||
| pcm-s32le_planar | ||
| pcm-u8 | ||
| pcm-u16be | ||
| pcm-u16le | ||
| pcm-u24be | ||
| pcm-u24le | ||
| pcm-u32be | ||
| pcm-u32le | ||
| roqaudio | ||