aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg-filters.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-06 17:12:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-06 17:13:09 +0100
commit2a58d5fc0e842ebc9a47523a8c3418580b40b4be (patch)
treecacef84d4c5ab10d50a2278f64e40780b2fb8721 /doc/ffmpeg-filters.texi
parent8367bc6be890472efee13e191eac5d7214eab2d2 (diff)
parent6892d145a0c80249bd61ee7dd31ec851c5076bcd (diff)
downloadffmpeg-2a58d5fc0e842ebc9a47523a8c3418580b40b4be.tar.gz
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>
Diffstat (limited to 'doc/ffmpeg-filters.texi')
0 files changed, 0 insertions, 0 deletions