[FFmpeg-cvslog] Merge commit '05e59135b3539062465b5005b6d46ec0418a5fc4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 14:23:53 2014 +0100| [0de64082a967c88959e5f3962d34eeab0dc4e7a6] | committer: Michael Niedermayer

Merge commit '05e59135b3539062465b5005b6d46ec0418a5fc4'

* commit '05e59135b3539062465b5005b6d46ec0418a5fc4':
  nutdec: do not set has_b_frames

Not merged, this change is not correct

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0de64082a967c88959e5f3962d34eeab0dc4e7a6
---