diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 14:29:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-30 14:51:06 +0100 |
| commit | cbed2426a0299b33d1c88c110e6ccfad6fc6f0e1 (patch) | |
| tree | 931bee676ef434095205090478e70fd2ea9a4dd8 /libavfilter/af_asetnsamples.c | |
| parent | 384dd9804d63fead9bb884a52ff53c17348741e9 (diff) | |
| parent | d615da60c1f95359d972a1cdf1d5e937930bda3f (diff) | |
| download | ffmpeg-cbed2426a0299b33d1c88c110e6ccfad6fc6f0e1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
snow: use VideoDSPContext
Conflicts:
libavcodec/snow.c
Nothing merged here, this has already been fixed in ffmpeg long ago
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asetnsamples.c')
0 files changed, 0 insertions, 0 deletions