diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:27:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:31:14 +0200 |
| commit | d70b4944223831c17a37680bbd9d3caca1c32659 (patch) | |
| tree | 3e4b3b07e6c12924ae6ad3c52ee5878798c1ec3d /libavutil/dict.c | |
| parent | 0726d516dcd1e12d493b402bbe256d8c4b50acc6 (diff) | |
| parent | 8ec464c61c46a5d088b43d24e384d6c37b7ef14a (diff) | |
| download | ffmpeg-d70b4944223831c17a37680bbd9d3caca1c32659.tar.gz | |
Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'
* commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a':
vf_drawtext: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/dict.c')
0 files changed, 0 insertions, 0 deletions