diff options
| author | Michael Niedermayer <[email protected]> | 2013-01-07 13:32:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-01-07 14:03:48 +0100 |
| commit | 2db8660f094ab15ce15f024f97134440a3654932 (patch) | |
| tree | a823109bedebea39e66b9e2d30451b3aca3bd3d2 /libavcodec/audio_frame_queue.c | |
| parent | 8b4842c2e2cc85498a62a9987b4c2de77e027332 (diff) | |
| parent | 89b51b570daa80e6e3790fcd449fe61fc5574e07 (diff) | |
Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'
* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
oggdec: free the ogg streams on read_header failure
Conflicts:
libavformat/oggdec.c
Original commit this was based on: (this merge just moves the function up)
commit 07a866282f08985c65c47ebabcf7b20f1c46daa0
Author: Michael Niedermayer <[email protected]>
Date: Tue Nov 20 15:12:37 2012 +0100
oggdec: fix memleak on header parsing failure
Fixes Ticket1931
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/audio_frame_queue.c')
0 files changed, 0 insertions, 0 deletions