aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/audio_mix_matrix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-17 11:28:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-17 11:29:22 +0200
commit71fcb6072ea6258b28e6267a3d7d5287569b2f26 (patch)
tree60e319e1c9bf07580a9a50194be7cf7758801154 /libavresample/audio_mix_matrix.c
parentc7078f4907dcff6877cf38f48526788c10644f07 (diff)
parent3fb29588a27a711132106b924e27b53789a58dcb (diff)
downloadffmpeg-71fcb6072ea6258b28e6267a3d7d5287569b2f26.tar.gz
Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'
* commit '3fb29588a27a711132106b924e27b53789a58dcb': vf_drawtext: don't leak the expressions. vf_crop: make config_props work properly when called multiple times. vf_setdar: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_aspect.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
0 files changed, 0 insertions, 0 deletions