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:
fde1bc6
)
mjpegenc: enable frame multithreading encoder
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 14 Jun 2012 19:20:23 +0000
(21:20 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Jun 2012 23:38:47 +0000
(
01:38
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpegenc.c
b/libavcodec/mjpegenc.c
index
0bec8f2
..
385a361
100644
(file)
--- a/
libavcodec/mjpegenc.c
+++ b/
libavcodec/mjpegenc.c
@@
-504,7
+504,7
@@
AVCodec ff_mjpeg_encoder = {
.init = ff_MPV_encode_init,
.encode2 = ff_MPV_encode_picture,
.close = ff_MPV_encode_end,
- .capabilities = CODEC_CAP_SLICE_THREADS | CODEC_CAP_INTRA_ONLY,
+ .capabilities = CODEC_CAP_SLICE_THREADS | CODEC_CAP_
FRAME_THREADS | CODEC_CAP_
INTRA_ONLY,
.pix_fmts = (const enum PixelFormat[]){
PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE
},