aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lavf-regression.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-01 03:55:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-01 03:55:45 +0200
commit5628b9f5fb92a72fa35a46520cf6c4dc1942de25 (patch)
tree047513d7fd38a7a53db2b302ed9499346cff45d0 /tests/lavf-regression.sh
parent5b03caf9491d3f4a1ddbb5e1c9e7e619c4390af5 (diff)
parentab7c64624a1254d509b71c2a4945336567e93845 (diff)
downloadffmpeg-5628b9f5fb92a72fa35a46520cf6c4dc1942de25.tar.gz
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
* commit 'ab7c64624a1254d509b71c2a4945336567e93845': sgi: remove redundant argument from read_uncompressed_sgi() Conflicts: libavcodec/sgidec.c See: 0f65693529decc470e3f01cb950b1864ea982c06 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lavf-regression.sh')
0 files changed, 0 insertions, 0 deletions