Merge commit '05e59135b3539062465b5005b6d46ec0418a5fc4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 13:23:53 +0000 (14:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 13:32:43 +0000 (14:32 +0100)
* commit '05e59135b3539062465b5005b6d46ec0418a5fc4':
  nutdec: do not set has_b_frames

Not merged, this change is not correct

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

Trivial merge