[FFmpeg-cvslog] Merge commit '3bebca9634f05ea5da7624e3a3f35ec95341e250' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 13:00:48 2015 +0200| [fb2f96d9ef56e00c10ea8e8968a872adfbfbe662] | committer: Michael Niedermayer

Merge commit '3bebca9634f05ea5da7624e3a3f35ec95341e250' into release/2.2

* commit '3bebca9634f05ea5da7624e3a3f35ec95341e250':
  nut: Check chapter creation in decode_info_header

Conflicts:
	libavformat/nutdec.c

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

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