FormatContext: fix destructor by freeing the streams added

Clement Champetier · Clement Champetier · commit 83a63a6a5010 · 2016-10-27T12:29:30.000+02:00
* According to the doc, for each new stream added, the user should call avcodec_close and avformat_free_context. * See the doc: https://www.ffmpeg.org/doxygen/3.0/group__lavf__core.html#gadcb0fd3e507d9b58fe78f61f8ad39827
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -12,7 +12,7 @@ FormatContext::FormatContext(const std::string& filename, int req_flags, AVDicti
     , _options()
     , _isOpen(false)
 {
-    int ret = avformat_open_input(&_avFormatContext, filename.c_str(), NULL, options);
+    const int ret = avformat_open_input(&_avFormatContext, filename.c_str(), NULL, options);
     if(ret < 0)
     {
         std::string msg = "Unable to open file ";
@@ -44,10 +44,14 @@ FormatContext::~FormatContext()
     if(!_avFormatContext)
         return;
 
+    // free the streams added
+    for(unsigned int i = 0; i < _avFormatContext->nb_streams; ++i)
+        avcodec_close(_avFormatContext->streams[i]->codec);
+
+    // free the format context
     if(_isOpen)
         avformat_close_input(&_avFormatContext);
-    else
-        avformat_free_context(_avFormatContext);
+    avformat_free_context(_avFormatContext);
     _avFormatContext = NULL;
 }
 
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -23,11 +23,13 @@ class AvExport FormatContext
 public:
     /**
      * @brief Allocate an AVFormatContext by opening an input file
+     * @see InputFile
      */
     FormatContext(const std::string& filename, int req_flags = 0, AVDictionary** options = NULL);
 
     /**
      * @brief Allocate an AVFormatContext with default values
+     * @see OutputFile
      */
     FormatContext(int req_flags = 0);
 
