aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vqavideo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-28 11:02:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-28 11:02:01 +0200
commit7381d31f2267489ed5e939707b7e77a20adc168d (patch)
tree0e5811bf6eadc8742a1ee88634e9533d29eed927 /libavcodec/vqavideo.c
parent945c7e399af230d9fde6df641f13a11dfc5d4954 (diff)
parent0767bfd1994c4bf22e167ffadb8f823a950aad18 (diff)
downloadffmpeg-7381d31f2267489ed5e939707b7e77a20adc168d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavfi: allow user-provided execute() callbacks Conflicts: libavfilter/avfilter.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vqavideo.c')
0 files changed, 0 insertions, 0 deletions