diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 13:59:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 14:15:30 +0100 |
| commit | 69a6eddd607a80ed413a380aed51fbac3b9aa7a8 (patch) | |
| tree | d0a18b0f7bfc65167ebfa4271df1a2b3fd6ac698 | |
| parent | 086566a557eedc0cf70851b95f1cd7d691d3e41f (diff) | |
| parent | f2960097e42ddf9a356bab6547f87906f6999e0a (diff) | |
| download | ffmpeg-69a6eddd607a80ed413a380aed51fbac3b9aa7a8.tar.gz | |
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>
| -rw-r--r-- | doc/developer.texi | 11 | ||||
| -rw-r--r-- | libavcodec/bink.c | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index a108da7adc..eaf5980145 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -217,8 +217,13 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: @enumerate @item - Contributions should be licensed under the LGPL 2.1, including an - "or any later version" clause, or the MIT license. GPL 2 including + Contributions should be licensed under the + @uref{http://www.gnu.org/licenses/lgpl-2.1.html, LGPL 2.1}, + including an "or any later version" clause, or, if you prefer + a gift-style license, the + @uref{http://www.isc.org/software/license/, ISC} or + @uref{http://mit-license.org/, MIT} license. + @uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including an "or any later version" clause is also acceptable, but LGPL is preferred. @item @@ -341,8 +346,6 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: We think our rules are not too hard. If you have comments, contact us. -Note, these rules are mostly borrowed from the MPlayer project. - @anchor{Submitting patches} @section Submitting patches 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) |