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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/04/07 12:50:04

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

Log message:
                * server/asobj/NetStream{Ffmpeg,Gst}.cpp: Use the m_imageframe's
                  size to determine the size of the returned frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2807&r2=1.2808
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2807
retrieving revision 1.2808
diff -u -b -r1.2807 -r1.2808
--- ChangeLog   7 Apr 2007 12:38:32 -0000       1.2807
+++ ChangeLog   7 Apr 2007 12:50:04 -0000       1.2808
@@ -1,5 +1,10 @@
 2007-04-07 Tomas Groth Christensen <address@hidden>
 
+       * server/asobj/NetStream{Ffmpeg,Gst}.cpp: Use the m_imageframe's
+         size to determine the size of the returned frame.
+
+2007-04-07 Tomas Groth Christensen <address@hidden>
+
        * packaging/redhat/gnash.spec: Use --enable-media instead of
          --enable-sound.
        * server/video_stream_instance.cpp: Delete the image once displayed.

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/NetStreamFfmpeg.cpp    7 Apr 2007 12:38:32 -0000       1.32
+++ server/asobj/NetStreamFfmpeg.cpp    7 Apr 2007 12:50:04 -0000       1.33
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.32 2007/04/07 12:38:32 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.33 2007/04/07 12:50:04 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -905,9 +905,9 @@
        image::image_base* ret_image;
        int videoFrameFormat = gnash::render::videoFrameFormat();
        if (videoFrameFormat == render::YUV) {
-               ret_image = new image::yuv(m_VCodecCtx->width, 
m_VCodecCtx->height);
+               ret_image = new image::yuv(m_imageframe->m_width, 
m_imageframe->m_height);
        } else if (videoFrameFormat == render::RGB) {
-               ret_image = new image::rgb(m_VCodecCtx->width, 
m_VCodecCtx->height);
+               ret_image = new image::rgb(m_imageframe->m_width, 
m_imageframe->m_height);
        } else {
                return NULL;
        }

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/NetStreamGst.cpp       7 Apr 2007 11:55:50 -0000       1.22
+++ server/asobj/NetStreamGst.cpp       7 Apr 2007 12:50:04 -0000       1.23
@@ -614,9 +614,9 @@
        image::image_base* ret_image;
        int videoFrameFormat = gnash::render::videoFrameFormat();
        if (videoFrameFormat == render::YUV) {
-               ret_image = new image::yuv(m_VCodecCtx->width, 
m_VCodecCtx->height);
+               ret_image = new image::yuv(m_imageframe->m_width, 
m_imageframe->m_height);
        } else if (videoFrameFormat == render::RGB) {
-               ret_image = new image::rgb(m_VCodecCtx->width, 
m_VCodecCtx->height);
+               ret_image = new image::rgb(m_imageframe->m_width, 
m_imageframe->m_height);
        } else {
                return NULL;
        }