Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 12:24:37 +0000 (13:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 12:24:48 +0000 (13:24 +0100)
commit8d86e7b495896946f5e3c8751f06b2fd11d8213c
tree3782a5f0f619047270b9682591e792743272f987
parent0db6402d9116b826fdf7f35409d229358ad81fd3
parent060667195e6e6bc0fa63ce13c47e23aabe70d122
Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'

* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122':
  hevc: rename some HEVC conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/hevc.mak