diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 16:59:00 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 17:15:30 +0400 |
| commit | 69a6eddd607a80ed413a380aed51fbac3b9aa7a8 (patch) | |
| tree | d0a18b0f7bfc65167ebfa4271df1a2b3fd6ac698 /libavcodec/bink.c | |
| parent | 086566a557eedc0cf70851b95f1cd7d691d3e41f (diff) | |
| parent | f2960097e42ddf9a356bab6547f87906f6999e0a (diff) | |
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'
* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
bink: fix a check for the first frame.
doc/developer: Drop obsolete MPlayer reference
doc/developer: Add ISC license to list of acceptable licenses
doc/developer: Add web links for all suggested licenses
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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) |