Merge branch 'master' of slp-scm.sec.samsung.net:/tizen1/api/recorder

Conflicts:
	src/recorder.c

diff --cc src/recorder.c
index fe199c03b3583ad9f16b552a82796d860a39adec,a9de93e742fb7d3f0ced50086c9750c0b93f4efa..5ddc19b36e8e1b670895c943a95fe6f4cc0389b2
--- 1/src/recorder.c
--- 2/src/recorder.c
+++ b/src/recorder.c
@@@ -840,7 -840,7 +840,7 @@@ int recorder_attr_get_size_limit(record
        if( recorder == NULL) return _convert_recorder_error_code(__func__, RECORDER_ERROR_INVALID_PARAMETER);          
        int ret;
        recorder_s * handle = (recorder_s*)recorder;
-       ret = mm_camcorder_get_attributes(handle->mm_handle ,NULL, MMCAM_TARGET_MAX_SIZE  , kbyte, NULL);
 -      ret = mm_camcorder_get_attributes(handle->mm_handle ,NULL, ""  , kbyte, NULL);
++      ret = mm_camcorder_get_attributes(handle->mm_handle ,NULL, "target-max-size"  , kbyte, NULL);
        return _convert_recorder_error_code(__func__, ret);     
  }