aboutsummaryrefslogtreecommitdiffstats
path: root/doc/swresample.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-16 10:33:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-16 10:33:31 +0200
commit04dd5ddedad384669d531e4b334888e8d8888d54 (patch)
tree450c4ce9b1293a6f894e16185c39463de2ec92fe /doc/swresample.txt
parenta134f9676e4f7988d360b69e0aed176055c47bcb (diff)
parentc0279956b3ca3e5fd0a6a25253893d6f07000e68 (diff)
downloadffmpeg-04dd5ddedad384669d531e4b334888e8d8888d54.tar.gz
Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'
* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68': vf_fade: use the name 's' for the pointer to the private context vf_drawtext: use the name 's' for the pointer to the private context vf_drawbox: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/swresample.txt')
0 files changed, 0 insertions, 0 deletions