diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:34:16 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:34:16 +0100 |
| commit | 50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325 (patch) | |
| tree | 42a0d40d95549de461eb1f15165d2317bc1e81a3 /libavcodec/wmv2dec.c | |
| parent | 93c61c980d63101d7ea1664fd83c810e95ffdc06 (diff) | |
| parent | 8072345e9f86d88fbc4a15c17cb03f1e4701c9a5 (diff) | |
Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 4aef773808..629dc80ff8 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -219,7 +219,7 @@ 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, + ff_intrax8_decode_picture(&w->x8, &s->current_picture, &s->gb, 2 * s->qscale, (s->qscale - 1) | 1, s->loop_filter); |