diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-07 23:05:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-07 23:05:26 +0100 |
| commit | ec8e68c7633cd288c90e6e7057365d8c354661a4 (patch) | |
| tree | a5484fbf0e55694e4c0c47e0c8bee4720b09fce9 /libavcodec/aac_parser.c | |
| parent | 7c02a77d250ff24514e029d931f7bc16b3810504 (diff) | |
| parent | cffecc0e7ebd642afaa1fb9f56fab1fcc283293c (diff) | |
| download | ffmpeg-ec8e68c7633cd288c90e6e7057365d8c354661a4.tar.gz | |
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
avfilter/graphparser: Directly free filter memory if initialization fails
Conflicts:
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_parser.c')
0 files changed, 0 insertions, 0 deletions