diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:48:22 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:48:22 +0200 |
commit | 64ceeac26a441ede6eaf4bb99a5c3224b1803745 (patch) | |
tree | 80e0f111260eb0b13a5ab17a30c5859d92c4d30e /ffmpeg_videotoolbox.c | |
parent | 1dd5f3340e002bf923fbfd4774afe3fafc6ad713 (diff) | |
parent | b9ece15a01782b4f301c0c139d1d7b20f848914c (diff) | |
download | ffmpeg-64ceeac26a441ede6eaf4bb99a5c3224b1803745.tar.gz |
Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'
* commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c':
nullenc: Use the wrapped avframe pseudo-encoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg_videotoolbox.c')
0 files changed, 0 insertions, 0 deletions