diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 19:30:07 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 19:30:07 +0400 |
| commit | 7f2253078d3ea3051703358de9bde8c8ea16024a (patch) | |
| tree | a4736a95b873005fcfe051238966c72b536abf2b /libavfilter/vf_lut.c | |
| parent | 716588188d87178d4b850982b5b361150cb7e94c (diff) | |
| parent | a0a872d0733f60876b0c93f236bc4606f36fbf89 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: check motion vectors.
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_lut.c')
0 files changed, 0 insertions, 0 deletions