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/ogg | |
| 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/ogg')
| -rw-r--r-- | tests/ref/lavf/ogg | 4 |
1 files changed, 2 insertions, 2 deletions
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 |