[FFmpeg-cvslog] Merge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  9 15:10:31 2014 +0100| [c1362ca0479eedc6171306276f6ed4baa7e9882f] | committer: Michael Niedermayer

Merge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'

* commit 'e588615d938f8581f0d6f3771662d08cadfc00de':
  hevc: fix decoding of one PU wide files

Conflicts:
	libavcodec/hevc.c

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

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