Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 20:01:44 +0000 (22:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 20:04:36 +0000 (22:04 +0200)
* commit '0d989dbfc4bc5bc1d563e967449116a7a9865258':
  af_resample: check av_opt_set_dict return value

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

Simple merge