[FFmpeg-cvslog] Merge commit '9fcc632249be3080836a3afce25b3092939743ac' into release/2.2

Michael Niedermayer git at videolan.org
Sat Sep 20 14:46:15 CEST 2014

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at 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


Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e940d15a98cb91a991e226fbbfba669c6601e90a

More information about the ffmpeg-cvslog mailing list