Changeset 4017

Timestamp:

Apr 4, 2012 5:39:50 AM (13 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:

• include/pjmedia/format.h (modified) (1 diff)
• src/pjmedia-codec/ffmpeg_codecs.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/format.h

@@ -197 +197 @@
     PJMEDIA_FORMAT_MPEG2VIDEO = PJMEDIA_FORMAT_PACK('M', 'P', '2', 'V'),
     PJMEDIA_FORMAT_MPEG4    = PJMEDIA_FORMAT_PACK('M', 'P', 'G', '4'),
-    PJMEDIA_FORMAT_XVID     = PJMEDIA_FORMAT_PACK('x', 'v', 'i', 'd'),
 
 } pjmedia_format_id;

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -287 +287 @@
     {
         {PJMEDIA_FORMAT_MJPEG,  PJMEDIA_RTP_PT_JPEG,    {"JPEG",4}},
+        PJMEDIA_FORMAT_MJPEG, {640, 480}, {25, 1},
     },
     {
         {PJMEDIA_FORMAT_MPEG4,  0,                      {"MP4V",4}},
-    },
-    {
-        {PJMEDIA_FORMAT_XVID,   0,                      {"XVID",4}},
-        PJMEDIA_FORMAT_MPEG4,
+        PJMEDIA_FORMAT_MPEG4, {640, 480}, {25, 1},
     },
 };