diff options
author | James Almer <jamrial@gmail.com> | 2017-03-27 18:50:27 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-27 18:50:27 -0300 |
commit | 47c2ce2f75cd789fb7dc658c51bb4118a14628e2 (patch) | |
tree | d2528a0f518a86bfff1a297e2f4c0d3564a9385f /ffmpeg_videotoolbox.c | |
parent | cef2ba3603af7e45cab2f646e7946c55e93f669b (diff) | |
parent | 064f19f39e2f17927278c6ad8fe884a5b92310d6 (diff) | |
download | ffmpeg-streaming-47c2ce2f75cd789fb7dc658c51bb4118a14628e2.zip ffmpeg-streaming-47c2ce2f75cd789fb7dc658c51bb4118a14628e2.tar.gz |
Merge commit '064f19f39e2f17927278c6ad8fe884a5b92310d6'
* commit '064f19f39e2f17927278c6ad8fe884a5b92310d6':
avconv: support parsing bitstream filter options
This commit is a noop, see 5ef19590802f000299e418143fc2301e3f43affe
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffmpeg_videotoolbox.c')
0 files changed, 0 insertions, 0 deletions