Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 11:53:31 +0000 (12:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 11:58:17 +0000 (12:58 +0100)
commit919791f99dc835f9d4f082b16f3e215ca7e06b2e
treeb5a53a8018c3842fddd7b0532dcda9e3b894e439
parent1e5656bf8a8ecb6c0aadc8a183b63d5774b0c676
parentf548f9f9e7a2a08c780e88dac63b9d5d2c55efb0
Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'

* commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0':
  hevc: update conformance streams

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