From: SeungKeun Lee <sngn.lee@samsung.com>
Date: Mon, 20 Feb 2012 00:05:25 +0000 (+0900)
Subject: Merge branch 'master' of slp-scm.sec.samsung.net:/tizen1/api/recorder
X-Git-Tag: 2.0_alpha~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ac3bec3640912deb9f742acf4bdd0b9c5771966;p=platform%2Fcore%2Fapi%2Frecorder.git

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

Conflicts:
	src/recorder.c
---

3ac3bec3640912deb9f742acf4bdd0b9c5771966
diff --cc src/recorder.c
index fe199c0,a9de93e..5ddc19b
--- a/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);	
  }