Commit e0da8a8b authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' of git.linphone.org:mediastreamer2

parents 47efef2c c7200e65
......@@ -68,6 +68,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MS_VIDEO_SIZE_SIF_W 352
#define MS_VIDEO_SIZE_SIF_H 240
#define MS_VIDEO_SIZE_IOS_MEDIUM_W 480
#define MS_VIDEO_SIZE_IOS_MEDIUM_H 360
#define MS_VIDEO_SIZE_ISIF_W 352
#define MS_VIDEO_SIZE_ISIF_H 480
......
......@@ -130,6 +130,9 @@ int ms_yuv_buf_init_from_mblk(YuvBuf *buf, mblk_t *m){
}else if (size==(320*200*3)/2){/*format used by gTalk */
w=320;
h=200;
}else if (size==(MS_VIDEO_SIZE_IOS_MEDIUM_W*MS_VIDEO_SIZE_IOS_MEDIUM_H*3)/2){/*format used by iPhone in AVCaptureSessionPresetMedium */
w=480;
h=360;
}else {
ms_error("Unsupported image size: size=%i (bug somewhere !)",size);
return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment