aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/opt.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-17 12:01:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-17 12:01:47 +0100
commitc23d7de22ec0c14ad35d40c9073451c64a5ce74d (patch)
treed4f524dde77617c005fe8b74a60a9a19d9d5e547 /libavutil/opt.h
parente078549421b2845799abe878fc2a60ec89399fcc (diff)
parent84c0ece5fd9569c0f31804f02a199ecd0e7d13d8 (diff)
downloadffmpeg-c23d7de22ec0c14ad35d40c9073451c64a5ce74d.tar.gz
Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8': hevc: further reduce code duplication in hls_prediction_unit() Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
0 files changed, 0 insertions, 0 deletions