aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/dshow.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-20 14:40:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-20 14:40:54 +0200
commite940d15a98cb91a991e226fbbfba669c6601e90a (patch)
tree22ccae309df9c046b2faedf95ca95e4b4e716737 /libavdevice/dshow.c
parent481118615c153160fc0d5ec383a7b5ded276e226 (diff)
parent9fcc632249be3080836a3afce25b3092939743ac (diff)
downloadffmpeg-e940d15a98cb91a991e226fbbfba669c6601e90a.tar.gz
Merge commit '9fcc632249be3080836a3afce25b3092939743ac' into release/2.2
* commit '9fcc632249be3080836a3afce25b3092939743ac': pulse: Add a wallclock option to be compatible with other other captures Conflicts: libavdevice/pulse_audio_dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow.c')
0 files changed, 0 insertions, 0 deletions