Changeset 4017


Ignore:
Timestamp:
Apr 4, 2012 5:39:50 AM (8 years ago)
Author:
ming
Message:

Misc (Re #1446): Remove XVID format and add default resolution and fps for MPEG4 and MJPEG

Location:
pjproject/trunk/pjmedia
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia/format.h

    r3819 r4017  
    197197    PJMEDIA_FORMAT_MPEG2VIDEO = PJMEDIA_FORMAT_PACK('M', 'P', '2', 'V'), 
    198198    PJMEDIA_FORMAT_MPEG4    = PJMEDIA_FORMAT_PACK('M', 'P', 'G', '4'), 
    199     PJMEDIA_FORMAT_XVID     = PJMEDIA_FORMAT_PACK('x', 'v', 'i', 'd'), 
    200199 
    201200} pjmedia_format_id; 
  • pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

    r4015 r4017  
    287287    { 
    288288        {PJMEDIA_FORMAT_MJPEG,  PJMEDIA_RTP_PT_JPEG,    {"JPEG",4}}, 
     289        PJMEDIA_FORMAT_MJPEG, {640, 480}, {25, 1}, 
    289290    }, 
    290291    { 
    291292        {PJMEDIA_FORMAT_MPEG4,  0,                      {"MP4V",4}}, 
    292     }, 
    293     { 
    294         {PJMEDIA_FORMAT_XVID,   0,                      {"XVID",4}}, 
    295         PJMEDIA_FORMAT_MPEG4, 
     293        PJMEDIA_FORMAT_MPEG4, {640, 480}, {25, 1}, 
    296294    }, 
    297295}; 
Note: See TracChangeset for help on using the changeset viewer.