[FFmpeg-cvslog] Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb  1 13:59:00 2013 +0100| [69a6eddd607a80ed413a380aed51fbac3b9aa7a8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69a6eddd607a80ed413a380aed51fbac3b9aa7a8
---