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

[Michael Niedermayer]

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

Merge commit 'c34d1099db6f9bc49f30eb3141f87c42b01a3714' into release/2.2

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

Conflicts:
	libavformat/nutdec.c

See: 361702660d2c37a63b7d6381d39e1e1de8405260
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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