diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 12:32:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 12:32:24 +0200 |
| commit | cfa909ef5b7e0320f75cca10d932631fb03b49af (patch) | |
| tree | e3ad2ea6deac02715bc7640108d0e40825184677 /libavfilter/vf_drawtext.c | |
| parent | a444ddff03861b092558aa0b1b38b218fc636aaa (diff) | |
| parent | 0ef1660a6365ce60ead8858936b6f3f8ea862826 (diff) | |
| download | ffmpeg-cfa909ef5b7e0320f75cca10d932631fb03b49af.tar.gz | |
Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'
* commit '0ef1660a6365ce60ead8858936b6f3f8ea862826':
sierravmd: Do sanity checking of frame sizes
Conflicts:
libavformat/sierravmd.c
See: 47c4713a23d271eedd2eb2c02daa70cb0ea4e0ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawtext.c')
0 files changed, 0 insertions, 0 deletions