diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:26:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:31:51 +0200 |
| commit | 1e49439f04f4aeb45344e8753094d00ac4b1a5d6 (patch) | |
| tree | 621f7e9cdf461b997ef614f6c9c4c5657089e471 /tests/ref/lavf/mkv | |
| parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
| parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) | |
| download | ffmpeg-streaming-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.zip ffmpeg-streaming-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.tar.gz | |
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
avconv: set the "encoder" tag when transcoding
Conflicts:
ffmpeg.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/mkv')
| -rw-r--r-- | tests/ref/lavf/mkv | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 51fd2e7..bddc0d3 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -5e3e58192b11644477474a25bef2e022 *./tests/data/lavf/lavf.mkv -472559 ./tests/data/lavf/lavf.mkv +689990a4a083bf399ebdec5187340cc9 *./tests/data/lavf/lavf.mkv +472661 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 -6aac0de39634046f23a3447b08380efe *./tests/data/lavf/lavf.mkv -320288 ./tests/data/lavf/lavf.mkv +c0abeae6de6c08054887c088befe7c46 *./tests/data/lavf/lavf.mkv +320402 ./tests/data/lavf/lavf.mkv ./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 |
