Merge commit '2ec112f71cd03ccab1b6f9a00d29199a57bcc7a5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:13:46 +0000 (18:13 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:13:46 +0000 (18:13 +0100)
commit43266457b4f96e5f8becedf71971e4bb149afca3
tree74d653b18e9532ec393c9a65baaa6145963f4829
parent240ac53a5cccaccb0a17d42ab443ec3425423373
parent2ec112f71cd03ccab1b6f9a00d29199a57bcc7a5
Merge commit '2ec112f71cd03ccab1b6f9a00d29199a57bcc7a5'

* commit '2ec112f71cd03ccab1b6f9a00d29199a57bcc7a5':
  vf_pad: fix x, y option expression evaluation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavfilter/vf_pad.c