diff options
| author | rogerdpack <[email protected]> | 2013-01-15 19:09:15 -0700 |
|---|---|---|
| committer | rogerdpack <[email protected]> | 2013-01-15 19:09:15 -0700 |
| commit | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (patch) | |
| tree | fcf92b1c0f1772b379828125c2555a47d1c81c6b /libavcodec/bink.c | |
| parent | 47e88486b4b3b3de992b07f89dfaedf410a8bd5e (diff) | |
| parent | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (diff) | |
Merge remote-tracking branch 'origin/master' into combined
Diffstat (limited to 'libavcodec/bink.c')
| -rw-r--r-- | libavcodec/bink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 35fe962e8d..c2c1ea1b0c 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1209,7 +1209,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if ((ret = bink_decode_plane(c, &gb, plane_idx, !!plane)) < 0) return ret; } else { - if ((ret = binkb_decode_plane(c, &gb, plane_idx, !pkt->pts, !!plane)) < 0) + if ((ret = binkb_decode_plane(c, &gb, plane_idx, + !avctx->frame_number, !!plane)) < 0) return ret; } if (get_bits_count(&gb) >= bits_count) |