Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 01:02:09 +0000 (03:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 01:02:37 +0000 (03:02 +0200)
commitcdf6a9441ded7df881de388229c26354e42b0872
tree12bbc4d10f7a883a48eb9679e6149114f44d489a
parentde5ec08825918401b604d13c4c49bf6bef01ceb3
parenta7d070acb55c3ebbdd5e93e3366f32865732b8a3
Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'

* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
  vf_fieldorder: avoid using AV_PIX_FMT_NB

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