diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:17:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 02:43:34 +0200 |
| commit | 98a6806fddc2a0e8f402c9ebd7497f4a8d20f536 (patch) | |
| tree | b3d874332c592e18430fa091d670130bee02228b /libavcodec/snowenc.c | |
| parent | d35899ccce39e77a3f7fb667bdfc710c605d03a4 (diff) | |
| parent | 368f50359eb328b0b9d67451f56fda20b3255f9a (diff) | |
| download | ffmpeg-98a6806fddc2a0e8f402c9ebd7497f4a8d20f536.tar.gz | |
Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a':
dsputil: Split off quarterpel bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/qpeldsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snowenc.c')
| -rw-r--r-- | libavcodec/snowenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 5067a363ce..167b205cba 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1641,6 +1641,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->lambda2= s->m.lambda2= (s->m.lambda*s->m.lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT; s->m.dsp= s->dsp; //move + s->m.qdsp= s->qdsp; //move s->m.hdsp = s->hdsp; ff_init_me(&s->m); s->hdsp = s->m.hdsp; |