[FFmpeg-cvslog] Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 12:53:31 2014 +0100| [919791f99dc835f9d4f082b16f3e215ca7e06b2e] | committer: Michael Niedermayer

Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'

* commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0':
  hevc: update conformance streams

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=919791f99dc835f9d4f082b16f3e215ca7e06b2e
---