diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:06:33 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:07:07 +0200 |
commit | e6ffe7bcfc4a559624fdb543612d9ec839891793 (patch) | |
tree | aaae22c7f9a6167872c54463b2add23b928d2faa /libavcodec/vb.c | |
parent | 2278146a0ca06ab88cc4885f9f7b1d56eff9873f (diff) | |
parent | 09182b3224370e1d636631e77f201a8388766bd6 (diff) | |
download | ffmpeg-e6ffe7bcfc4a559624fdb543612d9ec839891793.tar.gz |
Merge commit '09182b3224370e1d636631e77f201a8388766bd6'
* commit '09182b3224370e1d636631e77f201a8388766bd6':
hevc: simplify rounding
Conflicts:
libavcodec/hevc_mvs.c
See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vb.c')
0 files changed, 0 insertions, 0 deletions