Michael Niedermayer
874c5b02c4
Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'
...
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
lavc: add a wrapper for AVCodecContext.get_buffer().
Conflicts:
libavcodec/4xm.c
libavcodec/8svx.c
libavcodec/bmv.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/kmvc.c
libavcodec/mpc7.c
libavcodec/mpegaudiodec.c
libavcodec/pcx.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/rl2.c
libavcodec/snow.c
libavcodec/targa.c
libavcodec/tscc.c
libavcodec/txd.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vmdav.c
libavcodec/vp56.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-05 15:18:12 +01:00
Michael Niedermayer
3affcc99a8
frame_thread_encoder: silence integer to pointer without cast warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-08 18:25:24 +01:00
Michael Niedermayer
f4aaf987a5
frame_thread_encoder: fix handling of case where the encoder does not output a packet.
...
This case could cause a deadlock
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-05 13:30:08 +01:00
Michael Niedermayer
f472d01c25
frame_thread_encode: fix context memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-28 17:04:11 +01:00
Michael Niedermayer
991db63951
frame_thread_encoder: fix packet memleak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-28 16:47:23 +01:00
Michael Niedermayer
2d5c80b2e8
frame_thread_encoder: pass frame pict type and quality
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-29 04:26:59 +02:00
Michael Niedermayer
097a909ea1
frame_thread_encoder: pass private options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-29 04:26:36 +02:00
Michael Niedermayer
fde1bc64ad
lavc: add frame multithreading capability (currently intra only)
...
Compared to the decoder side, this code is able to change both the
delay and the number of threads seamlessly during encoding. Also
any idle thread can pick up tasks, the strict round robin in order
limit is gone too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-23 01:38:47 +02:00
