Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:54:58 +0000 (02:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:54:58 +0000 (02:54 +0200)
commitde5ec08825918401b604d13c4c49bf6bef01ceb3
treea1033e948eb6a35a889df9bd010f2eb565d9b0a8
parenta37f2cc5797a9bd09e535f3353d1a6be0e0cfcf4
parent862f33c10ea38ea49fa4188725df5e5246dbd1d8
Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'

* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
  vf_scale: use the pixfmt descriptor API

Conflicts:
libavfilter/vf_scale.c

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