diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 16:29:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 16:29:15 +0100 |
| commit | d089e9a4d125269bbdc6e9e16456cd3f3a76baf8 (patch) | |
| tree | d70b86a86b4c0dfdf2b5327c74370dab1dbbe9e1 /libavdevice/v4l2enc.c | |
| parent | c427b2b86e726159873eb6cc4f7153c5bd778c55 (diff) | |
| parent | 299a56879d2d790ac0c40d09af18e7f03471de9e (diff) | |
| download | ffmpeg-d089e9a4d125269bbdc6e9e16456cd3f3a76baf8.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: make reading packets from thread blocking.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2enc.c')
0 files changed, 0 insertions, 0 deletions