Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:41:48 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:41:48 +0000 (11:41 +0200)
commit550defe16eeae2819f19751d9e323713999d9a65
tree8d2ef319a0dff769ae1a21ffc00cbce911fccfcf
parent2ee29b5fb936764785059eac391bc474cb16ac0c
parentb333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44
Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'

* commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44':
  lavf-regression: use -frames instead of -t for image tests

Conflicts:
tests/lavf-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/lavf-regression.sh