[FFmpeg-cvslog] Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 17:12:15 2014 +0100| [2a58d5fc0e842ebc9a47523a8c3418580b40b4be] | committer: Michael Niedermayer

Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'

* commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd':
  segafilm: fix leaks if reading the header fails

Conflicts:
	libavformat/segafilm.c

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

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