diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-26 21:38:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-26 21:38:52 +0100 |
commit | 19dbe89f03d0fc97a43a4ac7989e7db2d5bf313b (patch) | |
tree | f879c4d4aa6f0aa182c08ec4bebfc166d37713e7 /libavformat/avs.c | |
parent | 50833c9f7b4e1922197a8955669f8ab3589c8cef (diff) | |
parent | d92c6d82c03b89d565f70e7a8e5b03b25f78f70c (diff) | |
download | ffmpeg-19dbe89f03d0fc97a43a4ac7989e7db2d5bf313b.tar.gz |
Merge remote-tracking branch 'cigaes/master'
* 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>
Diffstat (limited to 'libavformat/avs.c')
0 files changed, 0 insertions, 0 deletions