diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 18:18:05 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 18:18:05 +0100 |
| commit | 42a088784b94847cd04802b36866cb9a8d196151 (patch) | |
| tree | d60d5ae253868ecb79dd12972a0d0552d92ac7b9 /libavfilter/vf_mergeplanes.c | |
| parent | 0e29820cd16461414236068992d9d35fa0ca058f (diff) | |
| parent | 563e6d860391bac0511984e5c0842320b5c94d2d (diff) | |
| download | ffmpeg-42a088784b94847cd04802b36866cb9a8d196151.tar.gz | |
Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'
* commit '563e6d860391bac0511984e5c0842320b5c94d2d':
segafilm: drop the "song and dance" for cinepak
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
0 files changed, 0 insertions, 0 deletions