[FFmpeg-cvslog] Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'

Michael Niedermayer git at videolan.org
Sun Feb 15 20:14:52 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 15 20:08:21 2015 +0100| [8242946af20fbd41142f5bd112f2d278bd69d314] | committer: Michael Niedermayer

Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'

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

Conflicts:
	Changelog

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

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





More information about the ffmpeg-cvslog mailing list