1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit '61fb67dcb2e71a268c422fc19d366040e59fb337'

* commit '61fb67dcb2e71a268c422fc19d366040e59fb337':
  buffersrc: accept the frame rate as argument.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-11 14:48:34 +01:00
commit 6375ba827a

Diff Content Not Available