OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19987fa
)
mpegvideo_enc: Don't call ff_h263dsp_init unconditionally
author
Martin Storsjö
<martin@martin.st>
Wed, 22 Jan 2014 14:58:36 +0000
(16:58 +0200)
committer
Martin Storsjö
<martin@martin.st>
Wed, 22 Jan 2014 16:42:38 +0000
(18:42 +0200)
This fixes builds with e.g. --disable-decoders --disable-encoders
--enable-encoder=mjpeg.
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/mpegvideo_enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo_enc.c
b/libavcodec/mpegvideo_enc.c
index
f04926a
..
5da5a25
100644
(file)
--- a/
libavcodec/mpegvideo_enc.c
+++ b/
libavcodec/mpegvideo_enc.c
@@
-708,7
+708,8
@@
av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
2 * 64 * sizeof(uint16_t), fail);
}
- ff_h263dsp_init(&s->h263dsp);
+ if (CONFIG_H263_ENCODER)
+ ff_h263dsp_init(&s->h263dsp);
if (!s->dct_quantize)
s->dct_quantize = ff_dct_quantize_c;
if (!s->denoise_dct)