[FFmpeg-cvslog] Merge remote-tracking branch 'lukaszmluki/master'

Michael Niedermayer git at videolan.org
Wed Apr 30 14:41:57 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 14:34:55 2014 +0200| [bb6d00f01417718315d7944c6c33950ea88fb287] | committer: Michael Niedermayer

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse_audio_enc: respect minreq while checking buffer fullness
  lavd/pulse_audio_enc: signal that buffer is still writable after write
  lavd/pulse_audio_enc: add pointer checks
  lavd/pulse_audio_enc: add more buffer attributes
  lavd/fbdev_dec: implement fbdev_get_device_list callback
  lavd/fbdev_enc: move list device code to fbdev_common
  lavd/fbdev_enc: remove redundant assignments

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

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





More information about the ffmpeg-cvslog mailing list