Merge commit '21b21aed797b5e636adcf2df811f96a95f208930' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:22:59 +0000 (21:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:23:13 +0000 (21:23 +0200)
* commit '21b21aed797b5e636adcf2df811f96a95f208930':
  nut: Check chapter creation in decode_info_header

Conflicts:
libavformat/nutdec.c

See: 3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nutdec.c

Simple merge