Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:27:17 +0000 (16:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 14:27:39 +0000 (16:27 +0200)
commit5195512addc1f6bced2e33b8faf77abb5b8703b6
tree41bb7964bb08f6bfc56ee98584d34ded7a2152dd
parentcde2de4a05dc5959f1ae10a92879a2244f25b4fd
parented53cc217f6a6e4ddb35e3f01a79496091dc82dc
Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'

* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
  hevc: derive partial merge list

Conflicts:
libavcodec/hevc_mvs.c

See: 4576eff05d94a5e0b853a7a595d31351cc539e7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_mvs.c