From 9ca48204cb8cce4241f3515b2980cafb34c2fbcf Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Wed, 4 Apr 2012 05:39:50 +0000 Subject: Misc (Re #1446): Remove XVID format and add default resolution and fps for MPEG4 and MJPEG git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4017 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia-codec/ffmpeg_codecs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pjmedia/src') diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c index f6c0b1ed..4200369a 100644 --- a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c +++ b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c @@ -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}, }, }; -- cgit v1.2.3