diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 14:34:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 14:34:59 +0200 |
| commit | bb6d00f01417718315d7944c6c33950ea88fb287 (patch) | |
| tree | 653a9f571e0cad7c124cb7624cbba199401ce1a1 /libavfilter/vf_fps.c | |
| parent | 421b21ca8a02a346ba03cea3bb2ecc33f791fc30 (diff) | |
| parent | 5bef4878d3081c25b9f09b22e312451686941ace (diff) | |
| download | ffmpeg-bb6d00f01417718315d7944c6c33950ea88fb287.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavfilter/vf_fps.c')
0 files changed, 0 insertions, 0 deletions