diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 12:41:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 12:41:15 +0200 |
| commit | 22a0249debb1b7dceee4820b6c067be3a7e88ccc (patch) | |
| tree | a00ecb65001d36aaff2bdffa7f15e0eeae6925ee /ffmpeg_opt.c | |
| parent | 71d008ebe4f96974433eecfd3575bc82eb4b06a8 (diff) | |
| parent | bb41115d56930b9f5d59e79dca254d1201246967 (diff) | |
Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'
* commit 'bb41115d56930b9f5d59e79dca254d1201246967':
imgutils: Do not declare avpriv_set_systematic_pal2 in the public header
Conflicts:
libavutil/internal.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions