[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libbase/embedVideoDecoderFfmpeg.cpp serve...
From: |
Martin Guy |
Subject: |
[Gnash-commit] gnash libbase/embedVideoDecoderFfmpeg.cpp serve... |
Date: |
Thu, 31 May 2007 09:19:32 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Martin Guy <martinwguy> 07/05/31 09:19:32
Modified files:
libbase : embedVideoDecoderFfmpeg.cpp
server/asobj : NetStreamFfmpeg.cpp
. : ChangeLog
Log message:
* libbase/embedVideoDecoderFfmpeg.cpp,
server/asobj/NetStreamFfmpeg.cpp:
Add comments by commented img_convert()s to use sws_scale()
when
implementing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3418&r2=1.3419
Patches:
Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libbase/embedVideoDecoderFfmpeg.cpp 31 May 2007 06:39:07 -0000 1.10
+++ libbase/embedVideoDecoderFfmpeg.cpp 31 May 2007 09:19:31 -0000 1.11
@@ -153,6 +153,7 @@
} else if (outputFormat == YUV && cc->pix_fmt !=
PIX_FMT_YUV420P) {
//assert(0); // TODO
//img_convert((AVPicture*) pFrameYUV, PIX_FMT_YUV420P,
(AVPicture*) pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, pCodecCtx->height);
+ // Don't use depreceted img_convert, use sws_scale
} else if (outputFormat == RGB && cc->pix_fmt != PIX_FMT_RGB24)
{
buffer.reset(convertRGB24(cc, frame));
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- server/asobj/NetStreamFfmpeg.cpp 31 May 2007 06:39:08 -0000 1.76
+++ server/asobj/NetStreamFfmpeg.cpp 31 May 2007 09:19:31 -0000 1.77
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.76 2007/05/31 06:39:08 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.77 2007/05/31 09:19:31 martinwguy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -888,6 +888,7 @@
} else if (m_videoFrameFormat == render::YUV &&
m_VCodecCtx->pix_fmt != PIX_FMT_YUV420P) {
assert(0); // TODO
//img_convert((AVPicture*) pFrameYUV, PIX_FMT_YUV420P,
(AVPicture*) pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, pCodecCtx->height);
+ // Don't use depreceted img_convert, use sws_scale
} else if (m_videoFrameFormat == render::RGB &&
m_VCodecCtx->pix_fmt != PIX_FMT_RGB24) {
buffer.reset(embedVideoDecoderFfmpeg::convertRGB24(m_VCodecCtx, m_Frame));
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3418
retrieving revision 1.3419
diff -u -b -r1.3418 -r1.3419
--- ChangeLog 31 May 2007 06:39:07 -0000 1.3418
+++ ChangeLog 31 May 2007 09:19:32 -0000 1.3419
@@ -1,3 +1,10 @@
+2007-05-31 Martin Guy <address@hidden>
+
+ * libbase/embedVideoDecoderFfmpeg.cpp,
+ server/asobj/NetStreamFfmpeg.cpp:
+ Add comments by commented img_convert()s to use sws_scale() when
+ implementing.
+
2007-05-31 Sandro Santilli <address@hidden>
* libbase/embedVideoDecoderFfmpeg.{cpp,h}:
- [Gnash-commit] gnash libbase/embedVideoDecoderFfmpeg.cpp serve...,
Martin Guy <=