diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 18:07:41 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 18:07:41 +0100 |
commit | 240ac53a5cccaccb0a17d42ab443ec3425423373 (patch) | |
tree | c7cfca72228d336edd7caa0cee67f74f131431c1 /libavfilter/vf_ocr.c | |
parent | df06cb561102488f09c9ef24494cc7dd843cad1a (diff) | |
parent | e2854e731f843906d9a9a5b882bed872341999fd (diff) | |
download | ffmpeg-240ac53a5cccaccb0a17d42ab443ec3425423373.tar.gz |
Merge commit 'e2854e731f843906d9a9a5b882bed872341999fd'
* commit 'e2854e731f843906d9a9a5b882bed872341999fd':
avresample: Document avresample_open() a little better
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/vf_ocr.c')
0 files changed, 0 insertions, 0 deletions