diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:45:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:00:04 +0200 |
| commit | 191430a28f6aba118471c2704e66b2abd1638b94 (patch) | |
| tree | 58665d3e174585ec7ff7ab43f941e260e92e3334 /ffplay.c | |
| parent | 506ebdac2a32e3fe27afd2ff40268c851fc1a817 (diff) | |
| parent | 28663511c99b3cdaf9387a15032259879474f5f4 (diff) | |
| download | ffmpeg-191430a28f6aba118471c2704e66b2abd1638b94.tar.gz | |
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'
* commit '28663511c99b3cdaf9387a15032259879474f5f4':
fate: Invoke pixdesc lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions