diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-02 00:34:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-02 00:34:24 +0200 |
| commit | 03b2b40fd7f010fc245d36c05c7439c058b927bf (patch) | |
| tree | 7b50d24beddf2544c6f51a0a078950a7673565c0 /tests/ref/fate/g2m3 | |
| parent | 838c5f3df7e98b15fd3acbcacaf315c32600ca45 (diff) | |
| parent | a31c4b2cbef9aee15910fc3df52519aef46760de (diff) | |
| download | ffmpeg-03b2b40fd7f010fc245d36c05c7439c058b927bf.tar.gz | |
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
fate-g2m3: disable the audio stream
Conflicts:
tests/ref/fate/g2m3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/g2m3')
| -rw-r--r-- | tests/ref/fate/g2m3 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/ref/fate/g2m3 b/tests/ref/fate/g2m3 index 47146a6722..e8fe6927da 100644 --- a/tests/ref/fate/g2m3 +++ b/tests/ref/fate/g2m3 @@ -1,29 +1,21 @@ #tb 0: 1001/24000 -#tb 1: 1/44100 0, 0, 0, 1, 3824640, 0x9a253d29 -1, 0, 0, 16384, 32768, 0x6b41078a -1, 14288, 14288, 16384, 32768, 0x96f7bfa2 0, 12, 12, 1, 3824640, 0xcb232b06 0, 15, 15, 1, 3824640, 0xb03c288c 0, 16, 16, 1, 3824640, 0x260b284e -1, 30672, 30672, 14336, 28672, 0xfafb3922 0, 18, 18, 1, 3824640, 0x53ed2f30 0, 19, 19, 1, 3824640, 0x00af334d 0, 21, 21, 1, 3824640, 0x35ba3ef7 0, 22, 22, 1, 3824640, 0x05c24e9a 0, 24, 24, 1, 3824640, 0x03846423 -1, 45005, 45005, 12288, 24576, 0x32d18657 0, 25, 25, 1, 3824640, 0x0bcf6423 0, 30, 30, 1, 3824640, 0x96446423 -1, 57293, 57293, 10240, 20480, 0x7d89c440 0, 33, 33, 1, 3824640, 0x9e8f6423 0, 34, 34, 1, 3824640, 0x22bc6423 0, 36, 36, 1, 3824640, 0x714a6423 -1, 67533, 67533, 12288, 24576, 0x23d44d0c 0, 37, 37, 1, 3824640, 0x060d6423 0, 39, 39, 1, 3824640, 0x5bf96423 0, 40, 40, 1, 3824640, 0xb3476423 -1, 79821, 79821, 12288, 24576, 0x77188395 0, 123, 123, 1, 3824640, 0xbf056423 0, 124, 124, 1, 3824640, 0x30746423 0, 126, 126, 1, 3824640, 0xea6f6423 |