ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Sep
20 14:40:54 2014 +0200| [e940d15a98cb91a991e226fbbfba669c6601e90a] | committer:
Michael Niedermayer
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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e940d15a98cb91a991e226fbbfba669c6601e90a
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
