aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/pulse_audio_enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-23 10:42:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-23 10:42:11 +0200
commit3e78f8689167d6edcf15afb2836ede9505bca1a2 (patch)
treefd603ef19cd1bfaff0a5ffb672597501ee3d7c14 /libavdevice/pulse_audio_enc.c
parent0edc79962641dd853cda187ee13b617701346061 (diff)
parent68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14 (diff)
downloadffmpeg-3e78f8689167d6edcf15afb2836ede9505bca1a2.tar.gz
Merge commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14' into release/2.2
* commit '68fd80ee1ca22c39b6ef4e6641b5b2e0d4d89a14': g2meet: allow size changes within original sizes Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_enc.c')
0 files changed, 0 insertions, 0 deletions