diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 12:03:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 12:11:29 +0200 |
| commit | 38f1d56769189c78c9302a460459c09e9e378a9d (patch) | |
| tree | 2af3b63997236faa6b413c2bb039f261393c5e54 /libavfilter/vf_removelogo.c | |
| parent | cc53c28fdc2bd060e90a82d4238ad26e619a9fca (diff) | |
| parent | b36e1893ef3430f039c1eaddeedcbb378f9c4444 (diff) | |
| download | ffmpeg-38f1d56769189c78c9302a460459c09e9e378a9d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: check for reference when inheriting mvs
See: 4b35ee0b7c0c4cbac3541a25a5e8c00b657c8f95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_removelogo.c')
0 files changed, 0 insertions, 0 deletions