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)
* commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47':
  af_resample: check av_opt_set_dict return value

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

Simple merge