diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 11:47:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 11:47:42 +0200 |
| commit | d2c613dd1460a34ca166550d5d9d8cdd5cf278df (patch) | |
| tree | 905ae19fbbe79b69367b68e8e351232f17d47041 /ffmpeg_opt.c | |
| parent | 57b8ce414be574a772d386f57afa502eac072085 (diff) | |
| parent | 54e03ff6af8a070f1055edd26028f3f7b2e2ca8e (diff) | |
| download | ffmpeg-d2c613dd1460a34ca166550d5d9d8cdd5cf278df.tar.gz | |
Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'
* commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e':
rtpproto: Support nonblocking reads
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions