Misc (Re #1446): Remove XVID format and add default resolution and fps for MPEG4 and MJPEG
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4017 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
2e727e8f70
commit
9597b009c4
|
@ -196,7 +196,6 @@ typedef enum pjmedia_format_id
|
|||
PJMEDIA_FORMAT_MPEG1VIDEO = PJMEDIA_FORMAT_PACK('M', 'P', '1', 'V'),
|
||||
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;
|
||||
|
||||
|
|
|
@ -286,13 +286,11 @@ static ffmpeg_codec_desc codec_desc[] =
|
|||
},
|
||||
{
|
||||
{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},
|
||||
},
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue