Changeset 3688

Timestamp:

Aug 8, 2011 4:18:55 AM (12 years ago)

Author:

bennylp

Message:

Misc (re #1320): fixed link error in pjmedia_test and aviplay samples if ffmpeg is not enabled

Location:

pjproject/trunk

Files:

• pjmedia/src/test/vid_codec_test.c (modified) (2 diffs)
• pjsip-apps/src/samples/aviplay.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/test/vid_codec_test.c

@@ -448 +448 @@
         return -10;
 
+#if PJMEDIA_HAS_FFMPEG_CODEC
     status = pjmedia_codec_ffmpeg_init(NULL, mem);
     if (status != PJ_SUCCESS)
         return -20;
+#endif
 
     rc = enum_codecs();
@@ -461 +463 @@
 
 on_return:
+#if PJMEDIA_HAS_FFMPEG_CODEC
     pjmedia_codec_ffmpeg_deinit();
+#endif
     pjmedia_vid_dev_subsys_shutdown();
     pj_pool_release(pool);

pjproject/trunk/pjsip-apps/src/samples/aviplay.c

@@ -492 +492 @@
     }
     
+#if PJMEDIA_HAS_FFMPEG_CODEC
     status = pjmedia_codec_ffmpeg_init(NULL, &cp.factory);
     if (status != PJ_SUCCESS)
         goto on_return;    
+#endif
 
     rc = aviplay(pool, argv[1]);
@@ -508 +510 @@
 
 on_return:    
+#if PJMEDIA_HAS_FFMPEG_CODEC
     pjmedia_codec_ffmpeg_deinit();
+#endif
     pjmedia_aud_subsys_shutdown();
     pjmedia_vid_dev_subsys_shutdown();