diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 23:36:46 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 23:36:54 +0300 |
| commit | 123fef54cc8fdadc70829ab12f587e4b64cdbc96 (patch) | |
| tree | a7e7fdb0590c0708b02cf6d3e3fee75685f5da4b /libavcodec/wmv2dec.c | |
| parent | 578fb5a27d4523c958a1907787b659883a2d9b5b (diff) | |
| parent | b1268e0f032a3af3912fe3fb8d3855e12d7ea83b (diff) | |
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 92f7f0bdf0..3be810c22e 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -219,7 +219,8 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) s->picture_number++; // FIXME ? if (w->j_type) { - ff_intrax8_decode_picture(&w->x8, &s->current_picture, &s->gb, + ff_intrax8_decode_picture(&w->x8, &s->current_picture, + &s->gb, &s->mb_x, &s->mb_y, 2 * s->qscale, (s->qscale - 1) | 1, s->loop_filter); |