Merge branch 'tizen_3.0' into tizen

Change-Id: I2d9ab25257f920803db1e62e85c256683ca90562

diff --git a/packaging/capi-media-video-util.spec b/packaging/capi-media-video-util.spec
index c895775..a1f6fd7 100755 (executable)
--- a/packaging/capi-media-video-util.spec
+++ b/packaging/capi-media-video-util.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-video-util
 Summary:    A Video Utility library in Tizen Native API
-Version:    0.1.8
+Version:    0.1.9
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/src/video_util.c b/src/video_util.c
index f433983..6fe67c1 100755 (executable)
--- a/src/video_util.c
+++ b/src/video_util.c
@@ -237,8 +237,12 @@ static void __video_util_transcode_completed_cb(int error, void *user_data)
        int error_value = VIDEO_UTIL_ERROR_NONE;
        video_util_s *_handle = (video_util_s *)user_data;
 
-       if ((_handle != NULL) && (_handle->_util_cb != NULL)
-               && (_handle->_util_cb->transcode_completed_cb != NULL)) {
+       if (_handle == NULL) {
+               video_util_error("INVALID_PARAMETER");
+               return;
+       }
+
+       if ((_handle->_util_cb != NULL) && (_handle->_util_cb->transcode_completed_cb != NULL)) {
                error_value = __video_util_error_convert(error);
                _handle->_util_cb->transcode_completed_cb(error_value, _handle->_util_cb->user_data);
        }