diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 12:57:58 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 12:57:58 -0300 |
| commit | df2ae8f3f0a8ce9d9aefa5efb664928a783759ec (patch) | |
| tree | 45da019b69aabaf47bc6ca7fc2efaceca65db3bb /ffmpeg.c | |
| parent | 83bf40f3cfcf4b7545e41836b37f21806004f136 (diff) | |
| parent | 5fa255b65c7887cc913f097aed1b581fbf1a8745 (diff) | |
| download | ffmpeg-streaming-df2ae8f3f0a8ce9d9aefa5efb664928a783759ec.zip ffmpeg-streaming-df2ae8f3f0a8ce9d9aefa5efb664928a783759ec.tar.gz | |
Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'
* commit '5fa255b65c7887cc913f097aed1b581fbf1a8745':
avconv: initialize output framerate earlier
Skipping this for now. It's not needed until several committs ahead,
and should be carefully implemented.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions
