Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:44:14 +0000 (15:44 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:44:14 +0000 (15:44 +0200)
commitf35c4ede9e0e360143a5b81adbbbec23f37fdce2
treef02f60c0479aec1f571ee4c1b47b9c6214df46ad
parentb03260fde08ca9759d7560df60bb6286420aad65
parentc9943f00cfa2471d1b8a3a9ddc7a21049a71090e
Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e'

* commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e':
  vf_framepack: Use av_image_copy() where appropriate

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