From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 13 Nov 2014 13:00:55 +0000 (+0100)
Subject: Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2c4d5d3497e92f37604ab20d14bc509c14b08992;p=ffmpeg

Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'

* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
  escape124: explicitly set get_bits1 variable

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

2c4d5d3497e92f37604ab20d14bc509c14b08992