diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 09:05:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 09:13:51 +0200 |
| commit | 4131f21f7761d911e5e1b1f44068b652872e454f (patch) | |
| tree | b798a257be175716ca739947498c4c03722c4f39 /libavfilter/vf_overlay.c | |
| parent | a7bb12a307568c0db72e6eb8d496a5651a8228df (diff) | |
| parent | 612a5049d9b4ac1c2a293daf75fe814b7a94fdc7 (diff) | |
| download | ffmpeg-4131f21f7761d911e5e1b1f44068b652872e454f.tar.gz | |
Merge commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7'
* commit '612a5049d9b4ac1c2a293daf75fe814b7a94fdc7':
avserver: do not use a static string as a default for a string option
See: 19c41c6d8ef6cc34cfde6bf877e059689e763bb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions