diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-04-04 05:39:50 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-04-04 05:39:50 +0000 |
| commit | 9ca48204cb8cce4241f3515b2980cafb34c2fbcf (patch) | |
| tree | ad8cd31371e8bd654f45f8038d2e74ca4cb2c187 /pjmedia | |
| parent | 3e8d57944439a50f12c3e3eef10a416ced22aa7f (diff) | |
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
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia/format.h | 1 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/ffmpeg_codecs.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pjmedia/include/pjmedia/format.h b/pjmedia/include/pjmedia/format.h index f279c568..c3206d86 100644 --- a/pjmedia/include/pjmedia/format.h +++ b/pjmedia/include/pjmedia/format.h @@ -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; 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}, }, }; |