Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:30:43 +0000 (22:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:31:39 +0000 (22:31 +0200)
commit55231323b0fdc84a529418d673148cf1f3157229
tree1771ba123fc921a3ff05868b00243ec876802666
parent73b8155b31ec7ad1132ecf5c45ac82acadeb28e5
parent254f3daba4271c1918d9a7ad155b1442ef93ed29
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'

* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
  nut: Make sure to clean up on read_header failure

Conflicts:
libavformat/nutdec.c

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