diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 01:50:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 01:50:26 +0100 |
| commit | f4c8d002231afbc181e97c512e459ec6860f7098 (patch) | |
| tree | 1e54b1287f49f89e3156284c40b5b87365c9a10a /libavfilter/vf_fps.c | |
| parent | ca9f7e1832785414362bb8aeef1c7eb0a454d92e (diff) | |
| parent | 6bb8720f00e2e6209665f819fb351fd42b82d5d0 (diff) | |
| download | ffmpeg-f4c8d002231afbc181e97c512e459ec6860f7098.tar.gz | |
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_fps.c')
0 files changed, 0 insertions, 0 deletions