Ignore:
Timestamp:
Aug 31, 2010 8:25:36 PM (11 years ago)
Author:
gah
Message:

re-merge with latest trunk changes

Location:
branches/blt4/src/objects
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/src/objects/Makefile.in

    r1581 r1897  
    2626CFLAGS_DEFAULT  = @CFLAGS_DEFAULT@
    2727LIB_SEARCH_DIRS = @LIB_SEARCH_DIRS@
    28 CFLAGS          = @CFLAGS@
     28CFLAGS          = @CFLAGS@ -fPIC
     29FFMPEG          = @HAVE_FFMPEG_LIBS@
    2930RM              = rm -f
    3031CC_SWITCHES = $(CFLAGS) $(INCLUDES) $(DEFINES) $(CFLAGS_DEBUG)
     
    3738                -I$(includedir)
    3839LIBS        = -L../core -lrappture
     40
    3941
    4042RANLIB      = @RANLIB@
     
    110112                RpObject.o
    111113
     114ifeq ($(FFMPEG),yes)
     115  # since ffmpeg libraries are available,
     116  # include them in compilation
     117  LIBS += -lavcodec -lavformat -lswscale
     118  HEADERS += RpMediaPlayer.h
     119  OBJS += RpMediaPlayer.o
     120endif
     121
    112122
    113123name        = RpObjects
  • branches/blt4/src/objects/RpObject.cc

    r1586 r1897  
    274274    }
    275275
    276     v = strchrnul(hint,'=');
     276    v = strchr(hint,'=');
    277277    *hintKey = hint;
    278     if ((*v == '\0') || (*(v+1) == '\0')) {
     278    if ((v == NULL) || (*v == '\0') || (*(v+1) == '\0')) {
    279279        // incomplete hint string
    280280        *hintVal = NULL;
Note: See TracChangeset for help on using the changeset viewer.