Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 02:37:56 +0000 (04:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 02:45:26 +0000 (04:45 +0200)
commitdcd984e24d0a1fb5616a5f4629a1328436d2ba7d
treef96bf0e71bd4b897b2b564d7ddb93b81b207d1f0
parent98e42a249e7891d295228ff19892450ba1f09092
parent87efaa97ceb0ad5820870855d6df3e569e6eac7e
Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'

* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
  af_join: Set the output frame format

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