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/fate/filter-colormatrix2 | |
| parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
| parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) | |
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/fate/filter-colormatrix2')
| -rw-r--r-- | tests/ref/fate/filter-colormatrix2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/fate/filter-colormatrix2 b/tests/ref/fate/filter-colormatrix2 index 9961bae4e5..d93786f831 100644 --- a/tests/ref/fate/filter-colormatrix2 +++ b/tests/ref/fate/filter-colormatrix2 @@ -1 +1 @@ -colormatrix2 e4ba95b7dd5e0862aa5f5e3ddc54bda4 +colormatrix2 f903abbaf0df887704c4126a497f5c80 |