diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-05 12:15:41 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-05 12:15:41 +0200 |
| commit | 4eded225ade30ee92a02a76e644969edbe8f61dc (patch) | |
| tree | f7e3b814bd62ac70daa8667bcbf7580f166c4917 /libavcodec/h264dsp.h | |
| parent | 00b5c19661857c55b7a727f2f64fdf70cd0b553b (diff) | |
| parent | fe026ba960790a004adfcff33f44f96b05538e5c (diff) | |
| download | ffmpeg-4eded225ade30ee92a02a76e644969edbe8f61dc.tar.gz | |
Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'
* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
drawtext: Drop stray guards
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h264dsp.h')
0 files changed, 0 insertions, 0 deletions