Merge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:49:07 +0000 (00:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:49:07 +0000 (00:49 +0100)
commitb4004124432e3c51fe8ec9c13b6c3db2baaf918e
tree806849f30f54f43e43c972d6516e0f90ee41fa99
parent158cf1d52df6d91580d6b74e55db8ffdbaf24011
parentdaef7feb09a0dde2265d56f77de8ae03f9612d47
Merge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4

* commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47':
  af_resample: check av_opt_set_dict return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_resample.c