summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitae Kim <kt920.kim@samsung.com>2012-09-03 22:34:50 +0900
committerKitae Kim <kt920.kim@samsung.com>2012-09-03 22:34:50 +0900
commit40473aba610cf4d2ff17334ff81b3712a189b453 (patch)
tree0c7a315a24dbfb240434dc1fb2bd6211bceb13d9
parentf6a2b9995b2d22971fd3c84a01794acc1f340172 (diff)
downloadgstreamer0.10-ffmpeg-emulator-40473aba610cf4d2ff17334ff81b3712a189b453.tar.gz
gstreamer0.10-ffmpeg-emulator-40473aba610cf4d2ff17334ff81b3712a189b453.tar.bz2
gstreamer0.10-ffmpeg-emulator-40473aba610cf4d2ff17334ff81b3712a189b453.zip
disable-ssse3 compile option and check memory region whether allocated or not.submit/master/20120920.1512022.0_alphamaster
-rw-r--r--configure.ac1
-rw-r--r--ext/ffmpeg/gstffmpegdef.c6
-rw-r--r--packaging/gst-ffmpeg-emul.spec2
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index ba651ff..e793f67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,6 +325,7 @@ else
--disable-doc \
--disable-gpl --disable-postproc --disable-swscale \
--disable-mmx --enable-neon \
+ --disable-ssse3 \
--disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay \
--disable-decoders --disable-encoders \
--disable-muxers --disable-demuxers \
diff --git a/ext/ffmpeg/gstffmpegdef.c b/ext/ffmpeg/gstffmpegdef.c
index 1cd07be..15536ed 100644
--- a/ext/ffmpeg/gstffmpegdef.c
+++ b/ext/ffmpeg/gstffmpegdef.c
@@ -831,7 +831,11 @@ emul_av_picture_copy (AVPicture * dst, uint32_t fsize, CodecExtraInfo * codec_in
CODEC_LOG (2, "fsize:%d\n", fsize);
/* Copy output buffer of decoded frame from QEMU */
- memcpy (dst->data[0], buf, fsize);
+ if (dst->data[0]) {
+ memcpy (dst->data[0], buf, fsize);
+ } else {
+ CODEC_LOG (1, "failed to copy converted frame.\n");
+ }
break;
}
sleep (1);
diff --git a/packaging/gst-ffmpeg-emul.spec b/packaging/gst-ffmpeg-emul.spec
index 941c1fb..e2591cf 100644
--- a/packaging/gst-ffmpeg-emul.spec
+++ b/packaging/gst-ffmpeg-emul.spec
@@ -1,5 +1,5 @@
Name: gst-ffmpeg-emul
-Version: 0.2.17
+Version: 0.2.18
Release: 1
Summary: GStreamer Streaming-media framework plug-in for Tizen emulator using FFmpeg.
Group: Libraries/Multimedia