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)
commit8b0ceb96da0e615e6c7e6ed11da5035c0506dadb
tree2a192b1a5b06edf7c2563592018e89d2061db072
parentce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7
parentb34257eefd98cb768ea2f53a390b8684d51e689a
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'

* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
  nut: Check chapter creation in decode_info_header

Conflicts:
libavformat/nutdec.c

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