diff options
author | James Almer <jamrial@gmail.com> | 2017-09-28 00:02:15 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-09-28 00:02:15 -0300 |
commit | d7458ca8d7c8ae65fca0e4641cdc77c6dc327808 (patch) | |
tree | 8a36be04fa47dab0b24e9bb0b5bcf201dad07377 /libavcodec/aliaspixenc.c | |
parent | d987f9cfe37027758eac54ccac1d9fa040fd5707 (diff) | |
parent | 44f2eda39ff55c69d4d739fb12a42a10b7ce581c (diff) | |
download | ffmpeg-d7458ca8d7c8ae65fca0e4641cdc77c6dc327808.tar.gz |
Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'
* commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c':
lavc: Add device context field to AVCodecContext
This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/aliaspixenc.c')
0 files changed, 0 insertions, 0 deletions