diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 23:40:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-28 23:48:23 +0200 |
| commit | fcc39099087e156196e3444ef479b2c778566405 (patch) | |
| tree | c01fed41ae719924e46f97ada39f186429f63c09 /tests/ref/fate | |
| parent | 31f9c228c042e7f0a017670e7eb18d9b27a71a10 (diff) | |
| parent | d4ae8ac92f619507aadd021bb67b517d39d3a36f (diff) | |
| download | ffmpeg-fcc39099087e156196e3444ef479b2c778566405.tar.gz | |
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
matroskadec: parse stereo mode on decoding
Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c
See: 4c509fe305bc79a913ef1b690df6c910c732f608 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
| -rw-r--r-- | tests/ref/fate/vp8-alpha | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/fate/vp8-alpha b/tests/ref/fate/vp8-alpha index 2b89817964..e974bbced9 100644 --- a/tests/ref/fate/vp8-alpha +++ b/tests/ref/fate/vp8-alpha @@ -1,5 +1,5 @@ #tb 0: 1/1000 -0, 0, 0, 0, 2108, 0x59b92a34, S=1, 1900, 0x8fb3adc5 +0, 0, 0, 0, 2108, 0x59b92a34, S=2, 1900, 0x8fb3adc5, 8, 0x00000000 0, 32, 32, 0, 142, 0x2f2a3fed, F=0x0, S=1, 160, 0xa13346af 0, 65, 65, 0, 157, 0x17804767, F=0x0, S=1, 209, 0x64115f15 0, 99, 99, 0, 206, 0x537262ca, F=0x0, S=1, 317, 0x44a09dd0 |