Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 15:29:09 +0000 (16:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 15:29:15 +0000 (16:29 +0100)
* cigaes/master:
  ffmpeg: make reading packets from thread blocking.

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

Trivial merge