Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Feb 2015 20:38:49 +0000 (21:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Feb 2015 20:38:52 +0000 (21:38 +0100)
* cigaes/master:
  ffmpeg: notify when the thread message queue blocks.
  ffmpeg: allow to set the thread message queue size.
  lavd/alsa: set frame_size field.

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

Trivial merge