Changeset 4051 for pjproject/trunk/pjsip-apps/src/samples/simpleua.c

Timestamp:

Apr 13, 2012 8:16:30 AM (11 years ago)

Author:

ming

Message:

Re #1446 (misc): Change the default of PJMEDIA_HAS_FFMPEG_VID_CODEC to PJMEDIA_HAS_FFMPEG_CODEC.

File:

• pjproject/trunk/pjsip-apps/src/samples/simpleua.c (modified) (2 diffs)

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

@@ -386 +386 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
 
-#  if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0
+#  if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0
     /* Init ffmpeg video codecs */
-    status = pjmedia_codec_ffmpeg_init(NULL, &cp.factory);
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
-#  endif  /* PJMEDIA_HAS_FFMPEG_CODEC */
+    status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
+#  endif  /* PJMEDIA_HAS_FFMPEG_VID_CODEC */
 
 #endif  /* PJMEDIA_HAS_VIDEO */
@@ -574 +574 @@
 
     /* Deinit ffmpeg codec */
-#   if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0
-    pjmedia_codec_ffmpeg_deinit();
+#   if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0
+    pjmedia_codec_ffmpeg_vid_deinit();
 #   endif