Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 01:12:49 +0000 (03:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 01:18:27 +0000 (03:18 +0200)
* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
  buffersrc: avoid using AV_PIX_FMT_NB

Conflicts:
libavfilter/buffersrc.c

No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d90a16bdb0ece6f5c67e12167a67a0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge