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)
* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122':
  hevc: rename some HEVC conformance streams

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

Simple merge