From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 27 Jan 2015 13:21:49 +0000 (+0100)
Subject: Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'
X-Git-Tag: android-x86-6.0-r1~737
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2d4b8af4f6883fad76f45c33466bd86b35f1c3eb;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'

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

Conflicts:
	libavcodec/hevc.c

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

2d4b8af4f6883fad76f45c33466bd86b35f1c3eb