diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-02 07:59:12 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-02 07:59:12 +0000 |
| commit | 83d4f16ae53e04481aac9fcd2deccb1322c18114 (patch) | |
| tree | 6c5b70bea3cb5ec96455906c068f2cba85309110 /libmpdemux/demux_ogg.c | |
| parent | 85915a0b581aa2e33c27474dbb53a01be499e2dc (diff) | |
| download | mpv-83d4f16ae53e04481aac9fcd2deccb1322c18114.tar.bz2 mpv-83d4f16ae53e04481aac9fcd2deccb1322c18114.tar.xz | |
Fix the memleak fix: in case of error, demux_close_ogg should be called
only once and demuxer->priv be freed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15322 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 4a00232ea1..d1a5fbd72d 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -756,6 +756,7 @@ int demux_ogg_open(demuxer_t* demuxer) { clear_sub = -1; s = demuxer->stream; + demuxer->priv = ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t)); sync = &ogg_d->sync; page = &ogg_d->page; @@ -1076,9 +1077,6 @@ int demux_ogg_open(demuxer_t* demuxer) { goto err_out; } - /// Finish to setup the demuxer - demuxer->priv = ogg_d; - if(!n_video || (video_id < 0)) demuxer->video->id = -2; else @@ -1112,7 +1110,6 @@ int demux_ogg_open(demuxer_t* demuxer) { return 1; err_out: - demux_close_ogg(demuxer); return 0; } |