diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-01-08 04:07:19 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-01-21 19:02:18 +0100 |
| commit | aff923c0b52d5e38ea3201c34451b918dd92285d (patch) | |
| tree | 0589d3755aa9c5b1f4cc6d3a311ceb6515da2b95 /libavcodec | |
| parent | ab905f1dbc736630538ce61907e6ba691f759d04 (diff) | |
| download | ffmpeg-aff923c0b52d5e38ea3201c34451b918dd92285d.tar.gz | |
avcodec/Makefile: Make H.263 encoder compilable without MPEG4 encoder
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/mpeg4videoenc.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f5cb63cb85..5ce3ee0ec9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -359,7 +359,7 @@ OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ mpeg4video.o mpeg4videodec.o \ h263data.o OBJS-$(CONFIG_H263I_DECODER) += intelh263dec.o -OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ +OBJS-$(CONFIG_H263_ENCODER) += mpeg4video.o \ h263.o ituh263enc.o h263data.o OBJS-$(CONFIG_H263_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_H263_V4L2M2M_ENCODER) += v4l2_m2m_enc.o @@ -497,6 +497,7 @@ OBJS-$(CONFIG_MPEG2_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MPEG2_VAAPI_ENCODER) += vaapi_encode_mpeg2.o OBJS-$(CONFIG_MPEG2_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o +OBJS-$(CONFIG_MPEG4_ENCODER) += mpeg4videoenc.o OBJS-$(CONFIG_MPEG4_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MPEG4_OMX_ENCODER) += omx.o diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index b3fa910c64..a092ab01d0 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -961,9 +961,6 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, { int vo_ver_id; - if (!CONFIG_MPEG4_ENCODER) - return; - if (s->max_b_frames || s->quarter_sample) { vo_ver_id = 5; s->vo_type = ADV_SIMPLE_VO_TYPE; |