diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 16:28:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 17:07:26 +0100 |
| commit | bcd5fd5346be263162792be595eff9fc08e5c853 (patch) | |
| tree | b832637e5bce2a8906f5e1802fb3906612c25a27 /libavformat/rtmpproto.c | |
| parent | 8a9d0a1561470a185a3d09676fcf9b44830a4bfe (diff) | |
| parent | 3937b40e87c92993df6c62492c59f59cbeb97126 (diff) | |
| download | ffmpeg-bcd5fd5346be263162792be595eff9fc08e5c853.tar.gz | |
Merge commit 'lukaszmluki/master^'
* commit 'lukaszmluki/master^':
lavd/pulse_audio_enc: implement get_device_list callback
lavd/pulse_audio_dec: implement get_device_list callback
lavd/pulse_audio_common: add device detecting code
lavu/mem: add av_dynarray_add_nofree function
lavd/pulse_audio_enc: implement write_uncoded_frame callback
tools/uncoded_frame: fix audio codec generation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions