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 | |
| parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
| parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | tests/ref/lavf/mkv | 8 | ||||
| -rw-r--r-- | tests/ref/lavf/nut | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/ogg | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 51fd2e71b3..bddc0d3b19 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 diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut index 6c42a40d6e..3fb2baf544 100644 --- a/tests/ref/lavf/nut +++ b/tests/ref/lavf/nut @@ -1,3 +1,3 @@ -66386a488ee35e4592b605f63ef90a73 *./tests/data/lavf/lavf.nut -319902 ./tests/data/lavf/lavf.nut +c1142e54a176850a0c2e6cb41184f515 *./tests/data/lavf/lavf.nut +319948 ./tests/data/lavf/lavf.nut ./tests/data/lavf/lavf.nut CRC=0xec6c3c68 diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg index f8b58c4dbd..94187fe3c4 100644 --- a/tests/ref/lavf/ogg +++ b/tests/ref/lavf/ogg @@ -1,3 +1,3 @@ -304a201b4afa3583b206bdeef177ce6b *./tests/data/lavf/lavf.ogg -13495 ./tests/data/lavf/lavf.ogg +c03f7a025bd6c93203bd0e7e1e0330df *./tests/data/lavf/lavf.ogg +13511 ./tests/data/lavf/lavf.ogg ./tests/data/lavf/lavf.ogg CRC=0x3a1da17e |