diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-25 12:13:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-25 12:20:44 +0100 |
| commit | 4ce9e4e9c9c6d0e26256724c7966eebb9af38663 (patch) | |
| tree | a9c5a3ef43039e7315fed36bb0251a3f574945ab /libavfilter | |
| parent | ae65327e5e39b3a258a045d186cd61859204792c (diff) | |
| parent | fdaacc5932a813c1974e4bd61b5b499b070a610a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sndio_dec: Add missing includes for av_gettime()
no change, as this has already been fixed in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions