From cb30bf7f03ac1e2d8ae70e28cfe16beb9243604a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 31 Jan 2013 19:34:37 +0100 Subject: [PATCH 1/4] doc/developer: Add web links for all suggested licenses --- doc/developer.texi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/developer.texi b/doc/developer.texi index f24b4fe41c..7c14f97cb1 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -248,8 +248,11 @@ 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 the + @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 From 8b0fda180e99bf64d485d3e1f1e3a13ee20d053a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 31 Jan 2013 19:37:08 +0100 Subject: [PATCH 2/4] doc/developer: Add ISC license to list of acceptable licenses --- doc/developer.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/developer.texi b/doc/developer.texi index 7c14f97cb1..3f2c24da6c 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -250,8 +250,10 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: @item 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 the - @uref{http://mit-license.org/, MIT license}. + 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. From 8787847dc6b3e07020ca6f063d5e3fcbe2e93f0f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 31 Jan 2013 19:47:22 +0100 Subject: [PATCH 3/4] doc/developer: Drop obsolete MPlayer reference --- doc/developer.texi | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/developer.texi b/doc/developer.texi index 3f2c24da6c..a377ed1188 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -351,8 +351,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, some rules were borrowed from the MPlayer project. - @section Submitting patches First, read the @ref{Coding Rules} above if you did not yet, in particular From f2960097e42ddf9a356bab6547f87906f6999e0a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 31 Jan 2013 20:58:27 +0100 Subject: [PATCH 4/4] bink: fix a check for the first frame. Packet pts is a very unreliable indicator, use AVCodecContext.frame_number instead. --- libavcodec/bink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 7b81d052f3..3a74cf9d7f 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1200,7 +1200,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)