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)
commitd089e9a4d125269bbdc6e9e16456cd3f3a76baf8
treed70b86a86b4c0dfdf2b5327c74370dab1dbbe9e1
parentc427b2b86e726159873eb6cc4f7153c5bd778c55
parent299a56879d2d790ac0c40d09af18e7f03471de9e
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: make reading packets from thread blocking.

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