[FFmpeg-cvslog] Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 14:21:49 2015 +0100| [2d4b8af4f6883fad76f45c33466bd86b35f1c3eb] | committer: Michael Niedermayer

Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'

* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
  hevc: reindent after previous commit

Conflicts:
	libavcodec/hevc.c

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

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