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:
2c9be38
)
mjpegenc: disable huffman coding with AMV
author
Rostislav Pehlivanov
<atomnuker@gmail.com>
Mon, 3 Apr 2017 20:13:29 +0000
(21:13 +0100)
committer
Rostislav Pehlivanov
<atomnuker@gmail.com>
Sat, 8 Apr 2017 23:00:32 +0000
(
00:00
+0100)
Isn't supported.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
libavcodec/mpegvideo_enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo_enc.c
b/libavcodec/mpegvideo_enc.c
index
71a858f
..
882cf09
100644
(file)
--- a/
libavcodec/mpegvideo_enc.c
+++ b/
libavcodec/mpegvideo_enc.c
@@
-399,6
+399,9
@@
FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR(EINVAL);
}
+ if (s->huffman && avctx->codec_id == AV_CODEC_ID_AMV)
+ s->huffman = 0;
+
if (s->intra_dc_precision > (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 3 : 0)) {
av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n");
return AVERROR(EINVAL);