Merge commit '3e60501f311c50bf234033f206c19d34d889df01' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:42:07 +0000 (19:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:42:15 +0000 (19:42 +0200)
commitb5ae0e349adc1c9581a6d88e9ba55cc5dd4493c2
treef5e895f760594436a308e86abb50a7c8a69785b9
parent0a83007ceee404f9bfdcfc3feb780ace58738eaf
parent3e60501f311c50bf234033f206c19d34d889df01
Merge commit '3e60501f311c50bf234033f206c19d34d889df01' into release/0.10

* commit '3e60501f311c50bf234033f206c19d34d889df01':
  h264: slice-mt: check master context for valid current_picture_ptr

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