sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Sauw Ming 2012-04-04 05:39:50 +00:00
parent 2e727e8f70
commit 9597b009c4
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pjmedia/include/pjmedia/format.h
View File

@ -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;

6
pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
View File

@ -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},
},
};