ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Aug 27
20:51:39 2014 +0200| [42196083fe6336095d113f2e2da80fe6660519c7] | committer:
Michael Niedermayer
Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'
* commit '404731bd20e1df5880e6fe381e975ba48afc75b2':
pulse: Set the wallclock option as default
Conflicts:
libavdevice/pulse_audio_dec.c
No change, the option was already default in FFmpeg since a long time
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42196083fe6336095d113f2e2da80fe6660519c7
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
