Changeset 224:c63528c41fc2


Ignore:
Timestamp:
10/12/2012 06:02:37 PM (8 years ago)
Author:
Dmitry Fedorov <fedorov@…>
Branch:
default
Phase:
public
Message:

building fixes

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libsrc/libbioimg/formats/mpeg/FfmpegOVideo.cpp

    r220 r224  
    316316      else
    317317        fmt = av_guess_format(NULL, fname.c_str(), NULL);
    318       #elif
     318      #else
    319319      if (formatName.size() > 0)
    320320        fmt = guess_format(formatName.c_str(), NULL, NULL);
    … …  
    326326        #if (LIBAVCODEC_VERSION_MAJOR >= 54)
    327327        fmt = av_guess_format("mpeg", NULL, NULL);
    328         #elif
     328        #else
    329329        fmt = guess_format("mpeg", NULL, NULL);
    330330        #endif
    … …  
    342342        "Could not allocate the output media descriptor for \"" << fname <<
    343343        "\".  Are you out of memory?");
    344       #elif
     344      #else
    345345      VrRecoverableCheckMsg(oc = av_alloc_format_context(),
    346346        "Could not allocate the output media descriptor for \"" << fname <<

  • src/imgcnv.pro

    r223 r224  
    306306ffmpeg {
    307307
    308   DEFINES  += DIM_FFMPEG_FORMAT FFMPEG_VIDEO_DISABLE_MATLAB
     308  DEFINES  += DIM_FFMPEG_FORMAT FFMPEG_VIDEO_DISABLE_MATLAB __STDC_CONSTANT_MACROS
    309309  INCLUDEPATH += $$DN_LIB_FFMPEG/include
    310310  #INCLUDEPATH += $$DN_LIB_FFMPEG/ffmpeg-out/$$(HOSTTYPE)/include
Note: See TracChangeset for help on using the changeset viewer.