eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 11:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e5b878b37f64e443847dd7655d6c2068eb37e130
ffmpeg/libavdevice/pulse_audio_dec.c
Michael Niedermayer e940d15a98 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>
2014-09-20 14:40:54 +02:00

6.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink