aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-11 12:15:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-11 12:15:51 +0100
commit35e63f35b0e34a006fc2d2ce99fae8d1d314b322 (patch)
tree12cc143a3031cf093fa3b20d9f5f76196cd75c78 /libavresample/version.h
parent3bfb7a2537cf4d876d9c29df08da522573fc0ebc (diff)
parent416847d19593e87ee1704c26a9a638fd6b0d977c (diff)
downloadffmpeg-35e63f35b0e34a006fc2d2ce99fae8d1d314b322.tar.gz
Merge commit '416847d19593e87ee1704c26a9a638fd6b0d977c' into release/2.2
* commit '416847d19593e87ee1704c26a9a638fd6b0d977c': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/version.h')
0 files changed, 0 insertions, 0 deletions