diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-23 13:43:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-23 13:49:24 +0200 |
| commit | 800ea20cadce7c5ec06e7821dc83dedb6e20209e (patch) | |
| tree | d3400c82660ae2fa6f78776db2fec73aa1bd6ab2 /tests/ref/lavf/mov | |
| parent | c6f4a3a70837cf259466a7aab440dc0682b08c72 (diff) | |
| parent | 30ce289074e88f528965cb57720674a675639737 (diff) | |
| download | ffmpeg-streaming-800ea20cadce7c5ec06e7821dc83dedb6e20209e.zip ffmpeg-streaming-800ea20cadce7c5ec06e7821dc83dedb6e20209e.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/mov')
| -rw-r--r-- | tests/ref/lavf/mov | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 3b484ec..6c73753 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -673de726034d2a44be176fa8166df376 *./tests/data/lavf/lavf.mov +65ba2cff95100a4914b2ff507eb42818 *./tests/data/lavf/lavf.mov 366421 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xbb2b949b -e833d2e258ee20ef7c13470be8ea293b *./tests/data/lavf/lavf.mov +b9b988b23b5e5aff8760d0475908f837 *./tests/data/lavf/lavf.mov 357511 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xbb2b949b -75fd61635a9707a8bed9a32958fe3275 *./tests/data/lavf/lavf.mov +5c5c79e09490763a2692c91c5985b7ea *./tests/data/lavf/lavf.mov 366593 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xa9793231 -9bcbda2320a1434a3b9470389b45564e *./tests/data/lavf/lavf.mov +c1d4ff07ccad169cb6fca003661f0c12 *./tests/data/lavf/lavf.mov 356893 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xbb2b949b |
