[FFmpeg-cvslog] Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 17:29:05 2015 +0100| [b44456c908965231160f9b8f88de8c0dc447aa1f] | committer: Michael Niedermayer

Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'

* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
  nutenc: do not use has_b_frames

Conflicts:
	libavformat/nutenc.c
	tests/ref/lavf/nut
	tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct

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

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