diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:40:06 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:41:55 +0000 |
| commit | c82d31808bdcbafb1489cfb5d8e22c5272b484eb (patch) | |
| tree | 641e42cdcf41ee4a7bd59bd81618b53b2173339d /libavfilter/maskedmerge.h | |
| parent | 58dd885f9ae7feee002773253e345e11e7142739 (diff) | |
| parent | f7d77b9a5dd42bf0f5dffecf590466b4c4239437 (diff) | |
| download | ffmpeg-c82d31808bdcbafb1489cfb5d8e22c5272b484eb.tar.gz | |
Merge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'
* commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437':
eatqi: Remove MpegEncContext dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/maskedmerge.h')
0 files changed, 0 insertions, 0 deletions