[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1751-gb03912c

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  b03912c44d6c45faf3387e3a08ed0ef85922a966 (commit)
       via  8d3454b79c0a1aea39d7da02ad1c2cc86dc24d2a (commit)
      from  e64cc391debe8eaae230dd86a7a858401601172f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=b03912c44d6c45faf3387e3a08ed0ef85922a966


commit b03912c44d6c45faf3387e3a08ed0ef85922a966
Author: Gabriele Giacone <address@hidden>
Date:   Tue Aug 20 00:34:28 2013 +0200

    Fix warning: proper cast.

diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
index 2f0ded3..1a74971 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
@@ -371,7 +371,7 @@ VideoDecoderFfmpeg::decode(const boost::uint8_t* input,
 #if LIBAVCODEC_VERSION_MAJOR >= 53
     AVPacket pkt;
     av_init_packet(&pkt);
-    pkt.data = (uint8_t*) input;
+    pkt.data = const_cast<uint8_t*>(input);
     pkt.size = input_size;
     avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes,
             &pkt);

http://git.savannah.gnu.org/cgit//commit/?id=8d3454b79c0a1aea39d7da02ad1c2cc86dc24d2a


commit 8d3454b79c0a1aea39d7da02ad1c2cc86dc24d2a
Author: Gabriele Giacone <address@hidden>
Date:   Tue Aug 20 00:31:50 2013 +0200

    Fix warning: narrowing conversion inside { } is ill-formed in C++11.

diff --git a/libmedia/ffmpeg/VideoConverterFfmpeg.cpp 
b/libmedia/ffmpeg/VideoConverterFfmpeg.cpp
index 9680524..5247ce3 100644
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.cpp
@@ -162,7 +162,8 @@ VideoConverterFfmpeg::convert(const ImgBuf& src)
 #endif
 
 
-    AVPicture srcpicture = {{src.data, 0, 0, 0}, {src.stride[0], 0, 0, 0}};
+    AVPicture srcpicture = {{src.data, 0, 0, 0},
+        {static_cast<int>(src.stride[0]), 0, 0, 0}};
     
     
     int bufsize = avpicture_get_size(dst_pixFmt, width, height);

-----------------------------------------------------------------------

Summary of changes:
 libmedia/ffmpeg/VideoConverterFfmpeg.cpp |    3 ++-
 libmedia/ffmpeg/VideoDecoderFfmpeg.cpp   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash