aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_drawtext.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:04:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:05:04 +0100
commit40e123bc67cca2bb44a737e250481edc1b93048a (patch)
treee5bf467e5bc476eb091e6cdb7f6e5eb53095d476 /libavfilter/vf_drawtext.c
parentf2f88b952d666587fa6292bb219a82d0bee2229f (diff)
parented97963bdbf3bb17fca4f9ea0aa1a97722dec907 (diff)
downloadffmpeg-40e123bc67cca2bb44a737e250481edc1b93048a.tar.gz
Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'
* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907': ulti: invert the order of parameters of ulti_decode_frame() Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawtext.c')
0 files changed, 0 insertions, 0 deletions