Changeset 4051


Ignore:
Timestamp:
Apr 13, 2012 8:16:30 AM (8 years ago)
Author:
ming
Message:

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

Location:
pjproject/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

    r4049 r4051  
    379379 
    380380/** 
     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/** 
    381391 * Specify if FFMPEG video codecs are available. 
    382392 * 
    383  * Default: PJMEDIA_HAS_LIBAVCODEC 
     393 * Default: PJMEDIA_HAS_FFMPEG_CODEC 
    384394 */ 
    385395#ifndef PJMEDIA_HAS_FFMPEG_VID_CODEC 
    386 #   define PJMEDIA_HAS_FFMPEG_VID_CODEC         PJMEDIA_HAS_LIBAVCODEC 
     396#   define PJMEDIA_HAS_FFMPEG_VID_CODEC         PJMEDIA_HAS_FFMPEG_CODEC 
    387397#endif 
    388398 
  • pjproject/trunk/pjsip-apps/src/samples/aviplay.c

    r4018 r4051  
    501501    } 
    502502     
    503 #if PJMEDIA_HAS_FFMPEG_CODEC 
    504     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); 
    505505    if (status != PJ_SUCCESS) 
    506506        goto on_return;     
     
    519519 
    520520on_return:     
    521 #if PJMEDIA_HAS_FFMPEG_CODEC 
    522     pjmedia_codec_ffmpeg_deinit(); 
     521#if PJMEDIA_HAS_FFMPEG_VID_CODEC 
     522    pjmedia_codec_ffmpeg_vid_deinit(); 
    523523#endif 
    524524    pjmedia_aud_subsys_shutdown(); 
  • pjproject/trunk/pjsip-apps/src/samples/simpleua.c

    r3667 r4051  
    386386    PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1); 
    387387 
    388 #  if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0 
     388#  if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0 
    389389    /* 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 */ 
    393393 
    394394#endif  /* PJMEDIA_HAS_VIDEO */ 
     
    574574 
    575575    /* Deinit ffmpeg codec */ 
    576 #   if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0 
    577     pjmedia_codec_ffmpeg_deinit(); 
     576#   if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC!=0 
     577    pjmedia_codec_ffmpeg_vid_deinit(); 
    578578#   endif 
    579579 
  • pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

    r3937 r4051  
    122122    PJ_UNUSED_ARG(status); 
    123123 
    124 #if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0 
    125     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); 
    126126    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); 
    127127#endif 
     
    135135static void deinit_codecs() 
    136136{ 
    137 #if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0 
    138     pjmedia_codec_ffmpeg_deinit(); 
     137#if defined(PJMEDIA_HAS_FFMPEG_VID_CODEC) && PJMEDIA_HAS_FFMPEG_VID_CODEC != 0 
     138    pjmedia_codec_ffmpeg_vid_deinit(); 
    139139#endif 
    140140} 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

    r4043 r4051  
    7474    } 
    7575 
    76 #if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_CODEC 
    77     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); 
    7878    if (status != PJ_SUCCESS) { 
    7979        PJ_PERROR(1,(THIS_FILE, status, 
     
    130130    pjmedia_vid_dev_subsys_shutdown(); 
    131131 
    132 #if PJMEDIA_HAS_FFMPEG_CODEC 
    133     pjmedia_codec_ffmpeg_deinit(); 
     132#if PJMEDIA_HAS_FFMPEG_VID_CODEC 
     133    pjmedia_codec_ffmpeg_vid_deinit(); 
    134134#endif 
    135135 
Note: See TracChangeset for help on using the changeset viewer.