[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp |
Date: |
Tue, 02 Jan 2007 22:27:12 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 07/01/02 22:27:11
Modified files:
. : ChangeLog
server/asobj : NetStreamFfmpeg.cpp
Log message:
Static_cast'ing AV_NOPTS_VALUE to unsigned long and dynamic allocate
'buffer'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2036&r2=1.2037
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.2&r2=1.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -b -r1.2036 -r1.2037
--- ChangeLog 2 Jan 2007 22:04:36 -0000 1.2036
+++ ChangeLog 2 Jan 2007 22:27:11 -0000 1.2037
@@ -1,6 +1,9 @@
2002-01-02 Markus Gothe <address@hidden>
* utilities/processor.cpp if not GCC define optarg as extern.
+ * server/asobjs/NetStreamFfmpeg.cpp: Fixed static_cast of
+ AV_NOPTS_VALUE. Dynamic allocation of the buffer, since it's wasn't
+ valid ISO C++ before.
2007-01-02 Ann Barcomb <address@hidden>
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/NetStreamFfmpeg.cpp 21 Dec 2006 17:24:57 -0000 1.2
+++ server/asobj/NetStreamFfmpeg.cpp 2 Jan 2007 22:27:11 -0000 1.3
@@ -14,9 +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.3 2007/01/02 22:27:11 nihilus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -545,11 +543,12 @@
} else if (videoFrameFormat == render::RGB &&
m_VCodecCtx->pix_fmt != PIX_FMT_RGB24) {
AVFrame* frameRGB =
avcodec_alloc_frame();
unsigned int numBytes =
avpicture_get_size(PIX_FMT_RGB24, m_VCodecCtx->width, m_VCodecCtx->height);
- uint8_t buffer[numBytes];
+ uint8_t *buffer = new uint8_t[numBytes];
avpicture_fill((AVPicture *)frameRGB,
buffer, PIX_FMT_RGB24, m_VCodecCtx->width, m_VCodecCtx->height);
img_convert((AVPicture*) frameRGB,
PIX_FMT_RGB24, (AVPicture*) m_Frame, m_VCodecCtx->pix_fmt, m_VCodecCtx->width,
m_VCodecCtx->height);
av_free(m_Frame);
m_Frame = frameRGB;
+ delete [] buffer;
}
raw_videodata_t* video = new raw_videodata_t;
@@ -564,7 +563,7 @@
video->m_stream_index = m_video_index;
// set presentation timestamp
- if (packet.dts != AV_NOPTS_VALUE)
+ if (packet.dts != static_cast<unsigned
long>(AV_NOPTS_VALUE))
{
video->m_pts =
as_double(m_video_stream->time_base) * packet.dts;
}
- [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp,
Markus Gothe <=