highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-02-01 13:59:00 +01:00
commit 69a6eddd60
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/developer.texi
View File

@ -217,8 +217,13 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
@enumerate @enumerate
@item @item
Contributions should be licensed under the LGPL 2.1, including an Contributions should be licensed under the
"or any later version" clause, or the MIT license. GPL 2 including @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 an "or any later version" clause is also acceptable, but LGPL is
preferred. preferred.
@item @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. 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} @anchor{Submitting patches}
@section Submitting patches @section Submitting patches

3
libavcodec/bink.c
View File

@ -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) if ((ret = bink_decode_plane(c, &gb, plane_idx, !!plane)) < 0)
return ret; return ret;
} else { } 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; return ret;
} }
if (get_bits_count(&gb) >= bits_count) if (get_bits_count(&gb) >= bits_count)