Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 May 2013 09:23:55 +0000 (11:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 May 2013 09:27:44 +0000 (11:27 +0200)
commitfe5b0895966382402e8fb17f63dfe8117c8915ec
tree6e14fb542b5135950f54be551a5087e2795ec235
parentdce12f694864454c5e5a987bd3fa808e66268af4
parent5f87c277bd5caa09cc4f9061d4ccdd58dc121110
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'

* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_scale.c
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-field
tests/ref/fate/filter-pixfmts-hflip
tests/ref/fate/filter-pixfmts-il
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip