diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-13 02:26:11 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-13 02:26:11 +0000 |
| commit | 099ffbad71c520ade26335a8c9a9299abcfda185 (patch) | |
| tree | 517b4dbe3a7d06a54712af8c87d25c12d2e30218 | |
| parent | 64d1bed1542041370f054e693dcb131dac889618 (diff) | |
Misc (Re #1446): Remove XVID format usage in ffmpeg_util.c, PJMEDIA_FORMAT_XVID definition was removed in r4017 (thanks Bob van der Linden for the fix).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4044 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/ffmpeg_util.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/ffmpeg_util.c b/pjmedia/src/pjmedia/ffmpeg_util.c index 973022c8..0828515e 100644 --- a/pjmedia/src/pjmedia/ffmpeg_util.c +++ b/pjmedia/src/pjmedia/ffmpeg_util.c @@ -69,10 +69,7 @@ static const struct ffmpeg_codec_table_t {PJMEDIA_FORMAT_MPEG1VIDEO, CODEC_ID_MPEG1VIDEO}, {PJMEDIA_FORMAT_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO}, {PJMEDIA_FORMAT_MPEG4, CODEC_ID_MPEG4}, - {PJMEDIA_FORMAT_MJPEG, CODEC_ID_MJPEG}, -#if LIBAVCODEC_VERSION_MAJOR < 53 - {PJMEDIA_FORMAT_XVID, CODEC_ID_XVID}, -#endif + {PJMEDIA_FORMAT_MJPEG, CODEC_ID_MJPEG} }; static int pjmedia_ffmpeg_ref_cnt; |