diff options
| author | Michael Niedermayer <[email protected]> | 2014-01-06 17:12:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-01-21 16:42:32 +0100 |
| commit | c9a8dfa5ae162d719f554915af7bf0c9f918c943 (patch) | |
| tree | 71a1b439ae921169df4d9d709ba675b361175031 /libavutil/samplefmt.c | |
| parent | e6299a4cf9efc526da9c85522038a80c034b0ad3 (diff) | |
Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'
* commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd':
segafilm: fix leaks if reading the header fails
Conflicts:
libavformat/segafilm.c
See: ca5456db7fa62a81d8effa20fb7547c16dd1d796
Merged-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 2a58d5fc0e842ebc9a47523a8c3418580b40b4be)
Signed-off-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/samplefmt.c')
0 files changed, 0 insertions, 0 deletions