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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/25 17:50:02

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

Log message:
        always call av_read_frame on the stack-allocated AVPacket before 
returning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4959&r2=1.4960
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.95&r2=1.96

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4959
retrieving revision 1.4960
diff -u -b -r1.4959 -r1.4960
--- ChangeLog   25 Nov 2007 10:22:56 -0000      1.4959
+++ ChangeLog   25 Nov 2007 17:50:00 -0000      1.4960
@@ -1,5 +1,8 @@
 2007-11-25 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.cpp (decodeMediaFrame): always call
+         av_read_frame on the stack-allocated AVPacket before returning.
+         
        * server/parser/movie_definition.h: corrected some old names
          from doxygen page.
 

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/asobj/NetStreamFfmpeg.cpp    24 Nov 2007 17:21:44 -0000      1.95
+++ server/asobj/NetStreamFfmpeg.cpp    25 Nov 2007 17:50:01 -0000      1.96
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.95 2007/11/24 17:21:44 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.96 2007/11/25 17:50:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -969,6 +969,11 @@
                return true;
        }
 
+       // CHECKME: I'm not sure it's safe to call av_free_packet
+       //          on a statically allocated AVPacket.
+       //          Also, heap-allocating and storing in an auto_ptr
+       //          would make this function body simpler.
+       //
        AVPacket packet;
        int rc = av_read_frame(m_FormatCtx, &packet);
 
@@ -978,6 +983,7 @@
                {
                        if (!decodeAudio(&packet)) {
                                log_error(_("Problems decoding audio frame"));
+                               av_free_packet(&packet);
                                return false;
                        }
                }
@@ -986,6 +992,7 @@
                {
                        if (!decodeVideo(&packet)) {
                                log_error(_("Problems decoding video frame"));
+                               av_free_packet(&packet);
                                return false;
                        }
                }
@@ -994,6 +1001,7 @@
        else
        {
                log_error(_("Problems decoding frame"));
+               av_free_packet(&packet);
                return false;
        }