[FFmpeg-cvslog] Revert "avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716 "

Michael Niedermayer git at videolan.org
Sun Jul 21 18:03:38 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 21 17:51:25 2013 +0200| [37ecd67b5e149e55d71b1d8950abc5476d56999a] | committer: Michael Niedermayer

Revert "avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716"

This causes a race condition with VLC. Its plausible that other
applications also would have races with it and its just fixing a memleak when
the user application forgets to free the codec. It causes more
problems than it solves in its current form, thus the revert.
Better solutions are welcome

This reverts commit 0f229f9b91fe3c4ebd97e88f004d638819b76add.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37ecd67b5e149e55d71b1d8950abc5476d56999a
---

 libavformat/utils.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 202933e..9fd5e6e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3178,9 +3178,6 @@ void ff_free_stream(AVFormatContext *s, AVStream *st){
     av_assert0(s->nb_streams>0);
     av_assert0(s->streams[ s->nb_streams-1 ] == st);
 
-    if (st->codec) {
-        avcodec_close(st->codec);
-    }
     if (st->parser) {
         av_parser_close(st->parser);
     }



More information about the ffmpeg-cvslog mailing list