aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/audio_mix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-04 12:50:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-04 13:17:25 +0100
commitbfe03205a86c63edd4246a51f70284a2874ea352 (patch)
treed63fbed9d91c365ee503a0dc35a99584c40397a7 /libavresample/audio_mix.c
parent2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab (diff)
parent4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e (diff)
downloadffmpeg-bfe03205a86c63edd4246a51f70284a2874ea352.tar.gz
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions