Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:12:15 +0000 (17:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 16:13:09 +0000 (17:13 +0100)
commit2a58d5fc0e842ebc9a47523a8c3418580b40b4be
treecacef84d4c5ab10d50a2278f64e40780b2fb8721
parent8367bc6be890472efee13e191eac5d7214eab2d2
parent6892d145a0c80249bd61ee7dd31ec851c5076bcd
Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'

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

Conflicts:
libavformat/segafilm.c

See: ca5456db7fa62a81d8effa20fb7547c16dd1d796
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/segafilm.c