diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 10:47:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 10:47:49 +0200 |
| commit | 5cb9093aa8488b9ab5146184e8483f11dd739863 (patch) | |
| tree | 2e60ceb811e2043917f28404a6eb808fef454c3d /libavfilter/unsharp_opencl.c | |
| parent | 77c85cbd9d4dd17c8b8966cec252f89351634d27 (diff) | |
| parent | ac87eaf856e0fb51917266b899bb15d19b907baf (diff) | |
| download | ffmpeg-5cb9093aa8488b9ab5146184e8483f11dd739863.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wav: Always seek to an even offset
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/unsharp_opencl.c')
0 files changed, 0 insertions, 0 deletions