Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:09:26 +0000 (22:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:09:48 +0000 (22:09 +0200)
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
  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