[FFmpeg-cvslog] Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  2 04:37:56 2014 +0200| [dcd984e24d0a1fb5616a5f4629a1328436d2ba7d] | committer: Michael Niedermayer

Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'

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

See: e0dd8cadcc386a168e7acd079463880154086446
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcd984e24d0a1fb5616a5f4629a1328436d2ba7d
---