diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 15:04:42 +0200 |
| commit | c48e8d9dca550327b88106276aed17f87b23b7fe (patch) | |
| tree | 22691e94c032d6390a6e1a28c3bcf2dbea2f33c0 /libavcodec/brenderpix.c | |
| parent | fc67d937cc73fb68ab8d840e319e89c52df79c3d (diff) | |
| parent | 59b55c494e01de09dfd7cbf9cbbe7223265ac283 (diff) | |
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
lavc: deprecate unused me_threshold field
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/brenderpix.c')
0 files changed, 0 insertions, 0 deletions