summaryrefslogtreecommitdiff
path: root/pjsip-apps
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2012-01-06 11:28:19 +0000
committerNanang Izzuddin <nanang@teluu.com>2012-01-06 11:28:19 +0000
commit0ddcdbcb1b694d9eedc55ebb63aecfcbb9d6d443 (patch)
treefc468bcb791fcfb81f56d49bb4fb2af19d3a2817 /pjsip-apps
parentf063a6ca801248cbc876cbb18404fd3ea48b560e (diff)
Re #1441 (vid_streamutil): only apply the decoding format size (DEF_RENDERER_WIDTH/HEIGHT macro setting) if it is larger than the default.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3936 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
-rw-r--r--pjsip-apps/src/samples/vid_streamutil.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pjsip-apps/src/samples/vid_streamutil.c b/pjsip-apps/src/samples/vid_streamutil.c
index c944509a..86cc0293 100644
--- a/pjsip-apps/src/samples/vid_streamutil.c
+++ b/pjsip-apps/src/samples/vid_streamutil.c
@@ -611,8 +611,10 @@ int main(int argc, char *argv[])
#if DEF_RENDERER_WIDTH && DEF_RENDERER_HEIGHT
/* Set incoming video size */
- codec_param.dec_fmt.det.vid.size.w = DEF_RENDERER_WIDTH;
- codec_param.dec_fmt.det.vid.size.h = DEF_RENDERER_HEIGHT;
+ if (DEF_RENDERER_WIDTH > codec_param.dec_fmt.det.vid.size.w)
+ codec_param.dec_fmt.det.vid.size.w = DEF_RENDERER_WIDTH;
+ if (DEF_RENDERER_HEIGHT > codec_param.dec_fmt.det.vid.size.h)
+ codec_param.dec_fmt.det.vid.size.h = DEF_RENDERER_HEIGHT;
#endif
if (play_file.file_name) {