diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 23:09:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 23:09:26 +0200 |
commit | 9e1d97aa066942c3e1ebc72ea51400e831a2005e (patch) | |
tree | 29074511362c6eea3623d445e32eb03e120f7070 /libavcodec/motion_est.c | |
parent | 58e501b1e9c43ed855b36022e561032476dc8c2a (diff) | |
parent | efc2dfe6a0238ec08769626db899ea910be24407 (diff) | |
download | ffmpeg-9e1d97aa066942c3e1ebc72ea51400e831a2005e.tar.gz |
Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'
* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
avcodec options: add enum option for color_trc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
0 files changed, 0 insertions, 0 deletions