]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a9d0a1 3937b40)
Merge commit 'lukaszmluki/master^'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Mar 2014 15:28:28 +0000 (16:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Mar 2014 16:07:26 +0000 (17:07 +0100)
commitbcd5fd5346be263162792be595eff9fc08e5c853
treeb832637e5bce2a8906f5e1802fb3906612c25a27tree | snapshot
parent8a9d0a1561470a185a3d09676fcf9b44830a4bfecommit | diff
parent3937b40e87c92993df6c62492c59f59cbeb97126commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.