[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/11/27 11:08:23

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamFfmpeg.cpp 

Log message:
        2007-11-27 Benjamin Wolsey <[EMAIL PROTECTED]>
        
                * server/asobj/NetStreamFfmpeg.cpp: don't try to free codec 
context
                  for non-FLVs, however, because these are initialized 
differently (argh...)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4980&r2=1.4981
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.99&r2=1.100

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4980
retrieving revision 1.4981
diff -u -b -r1.4980 -r1.4981
--- ChangeLog   27 Nov 2007 11:05:27 -0000      1.4980
+++ ChangeLog   27 Nov 2007 11:08:22 -0000      1.4981
@@ -1,3 +1,8 @@
+2007-11-27 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+       * server/asobj/NetStreamFfmpeg.cpp: don't try to free codec context
+         for non-FLVs, however, because these are initialized differently.
+         
 2007-11-27 Sandro Santilli <[EMAIL PROTECTED]>
 
        * server/character.cpp (unload): don't abort if the character

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- server/asobj/NetStreamFfmpeg.cpp    27 Nov 2007 08:45:33 -0000      1.99
+++ server/asobj/NetStreamFfmpeg.cpp    27 Nov 2007 11:08:23 -0000      1.100
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.99 2007/11/27 08:45:33 bwy Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.100 2007/11/27 11:08:23 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -138,15 +138,21 @@
        if (m_VCodecCtx)
        {
                avcodec_close(m_VCodecCtx);
+               if (m_isFLV)
+               {
                av_free(m_VCodecCtx);
        }
+       }
        m_VCodecCtx = NULL;
 
        if (m_ACodecCtx)
        {
                avcodec_close(m_ACodecCtx);
+               if (m_isFLV)
+               {
                av_free(m_ACodecCtx);
        }
+       }
        m_ACodecCtx = NULL;
 
        if (m_FormatCtx)


_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit