diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 11:16:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 11:20:20 +0100 |
| commit | c2e995674fc2ed2a15082959ed36b7c9865c01f1 (patch) | |
| tree | b826779137aa92bc258fed7fa318c8aa0b1e799f /libavresample/resample.h | |
| parent | dd5123a04c67f74024128447e8ca9642241d6d45 (diff) | |
| parent | 4ad1eba011860224831ce0bb3123f6f55716b68a (diff) | |
| download | ffmpeg-c2e995674fc2ed2a15082959ed36b7c9865c01f1.tar.gz | |
Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'
* commit '4ad1eba011860224831ce0bb3123f6f55716b68a':
lavd: fix building x11grab after a6674d2
no change as the buggy line was not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/resample.h')
0 files changed, 0 insertions, 0 deletions