diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 14:33:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:03:22 +0200 |
| commit | 713dbe0655e4c3a906b0d812a6f90ac161223876 (patch) | |
| tree | fbd605821f014cfd5405a90c7335af208d08d2e2 /libavdevice/alsa-audio-dec.c | |
| parent | 9e052df86d522cddbddaafe584c2c8cf4d5f5032 (diff) | |
| parent | 706208ef47bffd525c982975d2756f7b2b220b8d (diff) | |
| download | ffmpeg-713dbe0655e4c3a906b0d812a6f90ac161223876.tar.gz | |
Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'
* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
fate: Split fate-pixdesc tests and dispatch them through Make
Conflicts:
tests/fate-run.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-dec.c')
0 files changed, 0 insertions, 0 deletions