diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:32:38 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:32:38 +0100 |
| commit | 36dad146935a500ef6fd7246b5c216f7af26f9db (patch) | |
| tree | 71c6109c6cda64b9a2655d3d5952806fe352c5b2 /libavcodec/wmv2dec.c | |
| parent | e5c655b09817da9388a8812b93e9948c44cc00af (diff) | |
| parent | eaeba6f241e0de0e797be10f8fda967ef8489e64 (diff) | |
| download | ffmpeg-36dad146935a500ef6fd7246b5c216f7af26f9db.tar.gz | |
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
intrax8: Pass the output frame to the decoding function
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 f0fe708a4e..4aef773808 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, 2 * s->qscale, (s->qscale - 1) | 1, + ff_intrax8_decode_picture(&w->x8, &s->current_picture, + 2 * s->qscale, (s->qscale - 1) | 1, s->loop_filter); ff_er_add_slice(&w->s.er, 0, 0, |