diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:20:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 01:22:35 +0100 |
| commit | 10ac6f3ce9ae4065a5b72ddfaded45f75b357518 (patch) | |
| tree | 75473d06359d37848c47425c3a97874adeb7ed14 /libavcodec/iff.c | |
| parent | ddfdcd2b5ecce0914c1eefa6269060bdbc879b17 (diff) | |
| parent | 952f943d40e9dbcd68bc851460cc99268091a294 (diff) | |
Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
* commit '952f943d40e9dbcd68bc851460cc99268091a294':
FATE: add a jv test
Conflicts:
tests/fate/video.mak
tests/ref/fate/jv
See: 7c52070131b7eb7f867fe1eab7383498814826df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/iff.c')
0 files changed, 0 insertions, 0 deletions