From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 29 May 2013 00:59:04 +0000 (+0200)
Subject: Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=28923f1923ba72804d55012a3b50a302a742f8f1;p=ffmpeg

Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'

* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
	libavcodec/vc1.c
	libavcodec/vc1dec.c

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

28923f1923ba72804d55012a3b50a302a742f8f1