Changeset 3688


Ignore:
Timestamp:
Aug 8, 2011 4:18:55 AM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/test/vid_codec_test.c

    r3667 r3688  
    448448        return -10; 
    449449 
     450#if PJMEDIA_HAS_FFMPEG_CODEC 
    450451    status = pjmedia_codec_ffmpeg_init(NULL, mem); 
    451452    if (status != PJ_SUCCESS) 
    452453        return -20; 
     454#endif 
    453455 
    454456    rc = enum_codecs(); 
     
    461463 
    462464on_return: 
     465#if PJMEDIA_HAS_FFMPEG_CODEC 
    463466    pjmedia_codec_ffmpeg_deinit(); 
     467#endif 
    464468    pjmedia_vid_dev_subsys_shutdown(); 
    465469    pj_pool_release(pool); 
  • pjproject/trunk/pjsip-apps/src/samples/aviplay.c

    r3667 r3688  
    492492    } 
    493493     
     494#if PJMEDIA_HAS_FFMPEG_CODEC 
    494495    status = pjmedia_codec_ffmpeg_init(NULL, &cp.factory); 
    495496    if (status != PJ_SUCCESS) 
    496497        goto on_return;     
     498#endif 
    497499 
    498500    rc = aviplay(pool, argv[1]); 
     
    508510 
    509511on_return:     
     512#if PJMEDIA_HAS_FFMPEG_CODEC 
    510513    pjmedia_codec_ffmpeg_deinit(); 
     514#endif 
    511515    pjmedia_aud_subsys_shutdown(); 
    512516    pjmedia_vid_dev_subsys_shutdown(); 
Note: See TracChangeset for help on using the changeset viewer.