diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-03-12 23:24:54 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-03-12 23:24:54 +0000 |
| commit | 2325bdad7b67b1c8539ef6beebb99d3247f08669 (patch) | |
| tree | bc6b9f9492a56a346ac26789a855a29d3a074016 | |
| parent | 4f4e40085fccde622ef0c257559f414b575d6816 (diff) | |
| download | ffmpeg-2325bdad7b67b1c8539ef6beebb99d3247f08669.tar.gz | |
libxvid is producing standard mpeg4 so it don't need its own codec id
Originally committed as revision 22489 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/libxvidff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index fd20f73545..661b23bc61 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -770,7 +770,7 @@ int xvid_ff_2pass(void *ref, int cmd, void *p1, void *p2) { AVCodec libxvid_encoder = { "libxvid", CODEC_TYPE_VIDEO, - CODEC_ID_XVID, + CODEC_ID_MPEG4, sizeof(struct xvid_context), xvid_encode_init, xvid_encode_frame, |