diff options
author | James Almer <jamrial@gmail.com> | 2017-03-31 16:28:35 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-31 16:28:35 -0300 |
commit | a4ee9551138c8ba7b93c098cacc867d2e9ee95d1 (patch) | |
tree | ae699dbdfa6a208eb05893a185e75253c813bb46 /libavcodec/mpegvideo.h | |
parent | 8e7497e774af8f2f26c4b0fd007bafabb1255e34 (diff) | |
parent | 8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67 (diff) | |
download | ffmpeg-a4ee9551138c8ba7b93c098cacc867d2e9ee95d1.tar.gz |
Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'
* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
vf_drawtext: Drop wrong void* cast
This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo.h')
0 files changed, 0 insertions, 0 deletions