Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:08:21 +0000 (20:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 19:08:21 +0000 (20:08 +0100)
commit8242946af20fbd41142f5bd112f2d278bd69d314
tree6fef2bffe09ce5b4c107f8fae1194b78cb3ab628
parent543e329a26701bdf6520914da633898858ed6114
parentd3449ac938333d59955360b6cb8e7bc24a9b792e
Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'

* commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e':
  changelog: mention DXVA/HEVC and AAC ELD480

Conflicts:
Changelog

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