[FFmpeg-cvslog] Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 28 12:53:17 2014 +0200| [453224f10b375c280ab2ef8f6e40213ba5b77d8a] | committer: Michael Niedermayer

Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'

* commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be':
  hevc: eliminate an unnecessary array

Conflicts:
	libavcodec/hevc.c

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

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