diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-23 13:43:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-23 13:49:24 +0200 |
| commit | 800ea20cadce7c5ec06e7821dc83dedb6e20209e (patch) | |
| tree | d3400c82660ae2fa6f78776db2fec73aa1bd6ab2 /libavcodec/tiff_common.c | |
| parent | c6f4a3a70837cf259466a7aab440dc0682b08c72 (diff) | |
| parent | 30ce289074e88f528965cb57720674a675639737 (diff) | |
Merge remote-tracking branch 'qatar/master'
* 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 <[email protected]>
Diffstat (limited to 'libavcodec/tiff_common.c')
0 files changed, 0 insertions, 0 deletions