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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/09 10:08:08

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

Log message:
        (decodeVideo): make somewhat more readable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6566&r2=1.6567
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.115&r2=1.116

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6566
retrieving revision 1.6567
diff -u -b -r1.6566 -r1.6567
--- ChangeLog   9 May 2008 10:03:24 -0000       1.6566
+++ ChangeLog   9 May 2008 10:08:08 -0000       1.6567
@@ -1,5 +1,10 @@
 2008-05-09 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.cpp (decodeVideo): make somewhat more
+         readable.
+
+2008-05-09 Sandro Santilli <address@hidden>
+
        * server/asobj/NetStreamFfmpeg.{cpp,h}: maintain a decoder
          buffer so to reuse it in case resampling is needed;
          allocate for it AVCODEC_MAX_AUDIO_FRAME_SIZE rather then 3/2

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- server/asobj/NetStreamFfmpeg.cpp    9 May 2008 10:03:25 -0000       1.115
+++ server/asobj/NetStreamFfmpeg.cpp    9 May 2008 10:08:08 -0000       1.116
@@ -936,8 +936,8 @@
 
        int got = 0;
        avcodec_decode_video(m_VCodecCtx, m_Frame, &got, packet->data, 
packet->size);
-       if (got)
-       {
+       if (!got) return false;
+
                if (m_imageframe == NULL)
                {
                        if (m_videoFrameFormat == render::YUV)
@@ -1073,9 +1073,6 @@
                else m_unqueued_data = m_qvideo.push(video) ? NULL : video;
 
                return true;
-       }
-
-       return false;
 }
 
 bool NetStreamFfmpeg::decodeMediaFrame()