diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 17:06:05 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 17:08:32 -0300 |
commit | bfab4308560c277d754c214210758a865fcc7348 (patch) | |
tree | 609493b886bed4b8a94bf89a6b8cad269224fb3b /libavcodec/proresdata.c | |
parent | fb41bad7e051240017bc4cc79c50ea36ac12b96c (diff) | |
parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) | |
download | ffmpeg-bfab4308560c277d754c214210758a865fcc7348.tar.gz |
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
lavc: Drop deprecated options moved to private contexts
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/proresdata.c')
0 files changed, 0 insertions, 0 deletions