virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity
Files
649b7a99463d5a43e47cbf8be9a788e20b21b3a8
FFmpeg/libavdevice/pulse_audio_dec.c
Michael Niedermayer 511398031c Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3' 
* commit '424b929b5cb9ca4094099f25179829260d4b0fa3':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
	libavdevice/pulse_audio_dec.c

wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 21:33:59 +02:00

12 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink