- Timestamp:
- Apr 13, 2012 8:16:30 AM (13 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/include/pjmedia-codec/config.h
r4049 r4051 379 379 380 380 /** 381 * Specify if FFMPEG codecs are available. 382 * 383 * Default: PJMEDIA_HAS_LIBAVCODEC 384 */ 385 #ifndef PJMEDIA_HAS_FFMPEG_CODEC 386 # define PJMEDIA_HAS_FFMPEG_CODEC PJMEDIA_HAS_LIBAVCODEC 387 #endif 388 389 390 /** 381 391 * Specify if FFMPEG video codecs are available. 382 392 * 383 * Default: PJMEDIA_HAS_ LIBAVCODEC393 * Default: PJMEDIA_HAS_FFMPEG_CODEC 384 394 */ 385 395 #ifndef PJMEDIA_HAS_FFMPEG_VID_CODEC 386 # define PJMEDIA_HAS_FFMPEG_VID_CODEC PJMEDIA_HAS_ LIBAVCODEC396 # define PJMEDIA_HAS_FFMPEG_VID_CODEC PJMEDIA_HAS_FFMPEG_CODEC 387 397 #endif 388 398 -
pjproject/trunk/pjsip-apps/src/samples/aviplay.c
r4018 r4051 501 501 } 502 502 503 #if PJMEDIA_HAS_FFMPEG_ CODEC504 status = pjmedia_codec_ffmpeg_ init(NULL, &cp.factory);503 #if PJMEDIA_HAS_FFMPEG_VID_CODEC 504 status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory); 505 505 if (status != PJ_SUCCESS) 506 506 goto on_return; … … 519 519 520 520 on_return: 521 #if PJMEDIA_HAS_FFMPEG_ CODEC522 pjmedia_codec_ffmpeg_ deinit();521 #if PJMEDIA_HAS_FFMPEG_VID_CODEC 522 pjmedia_codec_ffmpeg_vid_deinit(); 523 523 #endif 524 524 pjmedia_aud_subsys_shutdown(); -
pjproject/trunk/pjsip-apps/src/samples/simpleua.c
r3667 r4051 386 386 PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); 387 387 388 # if defined(PJMEDIA_HAS_FFMPEG_ CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0388 # if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0 389 389 /* Init ffmpeg video codecs */ 390 status = pjmedia_codec_ffmpeg_ init(NULL, &cp.factory);391 PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); 392 # endif /* PJMEDIA_HAS_FFMPEG_ CODEC */390 status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory); 391 PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); 392 # endif /* PJMEDIA_HAS_FFMPEG_VID_CODEC */ 393 393 394 394 #endif /* PJMEDIA_HAS_VIDEO */ … … 574 574 575 575 /* Deinit ffmpeg codec */ 576 # if defined(PJMEDIA_HAS_FFMPEG_ CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0577 pjmedia_codec_ffmpeg_ deinit();576 # if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0 577 pjmedia_codec_ffmpeg_vid_deinit(); 578 578 # endif 579 579 -
pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c
r3937 r4051 122 122 PJ_UNUSED_ARG(status); 123 123 124 #if defined(PJMEDIA_HAS_FFMPEG_ CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0125 status = pjmedia_codec_ffmpeg_ init(NULL, pf);124 #if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 125 status = pjmedia_codec_ffmpeg_vid_init(NULL, pf); 126 126 PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); 127 127 #endif … … 135 135 static void deinit_codecs() 136 136 { 137 #if defined(PJMEDIA_HAS_FFMPEG_ CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0138 pjmedia_codec_ffmpeg_ deinit();137 #if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 138 pjmedia_codec_ffmpeg_vid_deinit(); 139 139 #endif 140 140 } -
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c
r4043 r4051 74 74 } 75 75 76 #if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_ CODEC77 status = pjmedia_codec_ffmpeg_ init(NULL, &pjsua_var.cp.factory);76 #if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_VID_CODEC 77 status = pjmedia_codec_ffmpeg_vid_init(NULL, &pjsua_var.cp.factory); 78 78 if (status != PJ_SUCCESS) { 79 79 PJ_PERROR(1,(THIS_FILE, status, … … 130 130 pjmedia_vid_dev_subsys_shutdown(); 131 131 132 #if PJMEDIA_HAS_FFMPEG_ CODEC133 pjmedia_codec_ffmpeg_ deinit();132 #if PJMEDIA_HAS_FFMPEG_VID_CODEC 133 pjmedia_codec_ffmpeg_vid_deinit(); 134 134 #endif 135 135
Note: See TracChangeset
for help on using the changeset viewer.